last few changes that didn't get merged
Merge branch 'master' of github.com:zpap/SevenHeaven