Merge branch 'master' into newmodules
Merge pull request #6 from jyutzler/newmodules

Merge branch 'master' into newmodules