#17 fix for unresolved merge
Merge pull request #18 from Avinash-Bhat/conflict-fix

#17 fix for unresolved merge