Merge pull request #44 from SupunS/master

bugs fixed
Merge remote-tracking branch 'upstream/master'