Initial source code commit
Merge remote-tracking branch 'upstream/master'
Added initial tests
Removed debug statement
Merge pull request #2 from mvdriel/master

Initial source code commit