Merge pull request #96 from Therzok/master

5.1.0 Stubs and some misc.
Merge pull request #97 from Therzok/master

Misc fixes
Merge remote-tracking branch 'upstream/master'