Licence header updated
Merge remote-tracking branch 'upstream/master'
refined code
Merge pull request #37 from SupunS/master

Licence header updated