white collar
Merge pull request #18 from michalbe/master

update