Merge pull request #12 from ZettaBot/master

Minor changes