Closes  NERDZIlla issue #52
Merge branch 'master' of git://github.com/nerdzeu/nerdz.eu