Few modifications
Merge pull request #17 from SupunS/master

Few modifications