Close issue #1
Fixes issue #1
Merge pull request #2 from rowleyaj/dev

Dev