Merge pull request #134 from SupunS/master

Bug fixed and Restructured
modified exporting/hiding packages