Merge pull request #109 from SupunS/master

Changes of Review 11/26/2014