Merge pull request #47 from Magenic/master

Updating my local fork.
Fixing issue #185
Merge pull request #189 from jwendl/master

Fixing issue #185 and static analysis build issues.