Arkadiy Paronyan authored Apr 18, 2018 and asynchronous rob committed Apr 18, 2018

* Improved logging

* Removed some unwraps