Fixes problems with upstream changes
Fixed conflicts
Merge pull request #183 from mannol1/master

Fixes problems with upstream changes