Merge pull request #17 from low-sky/master

Merge of dev work