Merge pull request #4 from derekslenk/master

Close issue #3