Merge pull request #39 from defenestrator/dev-primary

Dev primary