Upgraded 1.8.0
Merge pull request #52 from robcio/patch-1

Upgraded 1.8.0