Fixed issue #12

Change-Id: I9637191c8f2cedf3363dfb4c9583646cc504a66a
Merge pull request #13 from ramnivas/fix-issue-12

Fixed issue #12