4.1 update
um
Merge pull request #449 from Podginator/master

4.1 update stuff and fixes