1.8 upgrade
Merge pull request #1 from beck24/master

1.8 update