update 1.7 to 1.8
Merge pull request #1 from Dietbrand/1.8update

update 1.7 to 1.8