Resolve conflict and merge changes
Merge pull request #91 from jmrozanec/master

Resolve conflict and merge changes