Merge pull request #4 from julianm3/workingBranch

Working branch
Merge remote-tracking branch 'origin/master' into workingBranch