Merge branch 'dev' of https://github.com/n8ebel/n8 into dev
Merge pull request #63 from n8ebel/dev

Merge branch 'dev' of https://github.com/n8ebel/n8 into dev