Merge pull request #18 from RConDev/development

Merge Issues for v0.2