Merge pull request #36 from martinqt/dev

Update
Merge branch 'master' into dev