Merge pull request #7 from prasannatsm/master

Fixed compilation issue due to incorrect merge