Merge pull request #11 from jmrozanec/master

Fix some files with unresolved merge conflicts