8 Commits (fix/issue-9)