New contributor - Berserker => initial commit, manual merge with local branch (refactoring + minor exception handling)