Pull request to master

Done.

Thank you for the all the help so far. Will definitely catch up on it during my free time.