Upgrade to 1.8.0.0 version
Merge pull request #12 from dancetrain/master

Upgrade to 1.8.0.0 version