7 Commits (feature/improve-code-stability)