Merge pull request #13 from ZettaBot/dev

Merge pull request #12 from ZettaBot/master
Merge pull request #14 from ZettaBot/master

Merge pull request #13 from ZettaBot/dev