Merge conflict fixes
Merge pull request #154 from Nghinazz/master

Merge conflict fixes