working!!!!!!!!!!!!!!!
Merge remote-tracking branch 'origin/master'
working!!!!!!!!!!!!!!!
Merge pull request #169 from jhaybie/majorRework

Major rework