Updated system and error handling
Merge branch 'dev' of https://github.com/oartemenko/hive