bugs fixed
Merge pull request #44 from SupunS/master

bugs fixed