Merge pull request #1 from gallantd/working

Working