Merge pull request #64 from SupunS/master

UI modified 10/23/2014-10.00 am