closes #5
Merge pull request #14 from NullScope/development

closes #5