Merge pull request #141 from nullquery/master

Pull request for #140
Merge pull request #3 from HypatiaStation/master

Merge pull request #141 from nullquery/master