Merge pull request #9 from wvanbreukelen/master

Merged master branch with testing branch
Added console application
Merge pull request #10 from wvanbreukelen/testing

Merged master branch with testing branch