Merge pull request #167 from jwendl/master

Fixing issues.