Merge pull request #34 from harshavardhana/master

Misc fixes