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

white collar++