Separated code and implemented error message
Merge branch 'master' of ssh://github.com/sicarul/isshub