fixes
Merge pull request #7 from vikdatta/master

Small fixes