Recommitting merging changes for bad commit
Merge branch 'master' of git://github.com/mmutzell/Bammi