Merge pull request #5 from giffels/mydev-branch

Merging recent developments