Adding more stuff
Merge branch 'master' of https://github.com/nodekc/diamonator into router