dirty hacks
Merge pull request #47 from defenestrator/primary-development

dirty hacks