white collar++
Merge pull request #16 from michalbe/master

white collar++