Fixed Issue #7
Merge pull request #8 from LarsVonQualen/Development

Fixed Issue #7