Fixed issue #12, #6
Merge branch 'master' of github.com:binarybucks/mqttitude