Added stuff on the fork
Merge pull request #1 from suggitpeToo/master

Please Mr Collaborator, will you pull this excellent code into the core version