resolve #1
Merge pull request #2 from trevor/master

resolve #1