Merge pull request #10 from countxyz/master

Hotfix 7 dev merge
Stabilization is awesome.