some fatal errors
Merge branch 'master' into feature_896_fileio