Fixed HostChangedError exception
Merge branch 'devel'