Merge pull request #4 from jereln/master

Merge pull request #3 from jereln/development