Merge branch 'iss26'

Solved conflicts
Revert "Merge branch 'iss26'"

This reverts commit d3f1acc603d50bfc94f5cf0e178f39af922e7d55.