Merge pull request #213 from jwendl/master

Fixing issues related to #210 and #208