Merge pull request #339 from keynslug/main-0.1

Merge pull request #339 from keynslug/main-0.1 #792