bug fixed
Merge pull request #134 from SupunS/master

Bug fixed and Restructured