Merge pull request #4 from jereln/master

Merge pull request #3 from jereln/development
Merge pull request #5 from jereln/development

Merge pull request #4 from jereln/master