Bugfixes for 1.6.1

* Pulling in the changes from #76. 
* Trying to fix the "proc" issue from untarring files.