Merge pull request #32 from nabinhait/master

Small issues fixed