Fixed issue 2
Merge pull request #13 from ecbtln/master

Fixed Issue 2