fixed minor things
Merge pull request #29 from swarage/master

fixed minor things