Merged the two modules
Merge pull request #8 from kdop/master

Merged the two modules