Fixed issue 2
Merge pull request #25 from AHochstadt/master

Fixed issue 2