Issue #168 - fix conflicts to pull develop