couple of tweaks and fixes here and there
Merge pull request #12 from obiot/master

couple of tweaks and fixes here and there