Merge pull request #7 from giffels/mydev-branch

Mydev branch