bits and pieces
Merge branch 'master' of https://github.com/dspeyer/Niki