White Collar++
Merge pull request #19 from michalbe/master

update