updates
Merge pull request #16 from defenestrator/development-primary

updates