Merge pull request #1 from gallantd/working

Working
Merge pull request #2 from gallantd/master

Merge pull request #1 from gallantd/working