issue #57, just for Damian :)
Merge branch 'master' of github.com:designcreateplay/NodeBB