Merge pull request #10 from ThomasRahn/master

Merging test cases
Merge pull request #11 from ThomasRahn/Development

Merge pull request #10 from ThomasRahn/master