Merge pull request #6 from giffels/mydev-branch

Mydev branch