Changes for 8.0
Merge pull request #126 from crafteverywhere/patch-2

Changes for 8.0