Merge pull request #7 from ThomasRahn/Development

Development
Merge pull request #9 from ThomasRahn/Alan

Unit Testing.
Merge pull request #10 from ThomasRahn/master

Merging test cases