Thijs' first commit
Merge branch 'thijs' of github.com:ThemGit/Segmenter