Fixed issue #100
Merge pull request #101 from valmat/FixIssue100

Fixed issue #100