Fix #3
Merge pull request #4 from chriscandy/develop

Fix #3