updated and cleaned files
Merge remote-tracking branch 'upstream/master'
Merge pull request #93 from SupunS/master

updated and cleaned files