changes as suggested by samir
Merge pull request #12 from damitr/master

changes as suggested by samir