Tried to solve conflicts.
Merge pull request #767 from jokies/master

Tried to solve conflicts.