Merge pull request #6 from HypatiaStation/master

Merge pull request #189 from nullquery/master
Fixes #198
Merge pull request #199 from nullquery/master

Fix for #198