Merge pull request #21 from tuxedio/development

Merge Master branch
Merge pull request #30 from tuxedio/development

Merge development to master (v0.0.1)