Implement Issue #13
Merge pull request #14 from LarsVonQualen/Development

Merge Issue #13