Post Merge Fixes

This merge just applies some minor fixes to the recently merged pull requests #57 and #70.