Merge conflict resolution
Merge pull request #67 from pshatara/master

Merge conflict resolution