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

updates