Merge pull request #39 from defenestrator/dev-primary

Dev primary
Merge pull request #40 from defenestrator/master

Merge pull request #39 from defenestrator/dev-primary