Changes and stuff
Merge pull request #28 from ganymedes01/master

Restore some 1.7.10 behaviour (+ some things)