Initial functional
Merge pull request #1 from collectrium/development

Initial functional