Merge pull request #6 from dotmaniac/v10-master

Merge v10 into Master