Create new branch in order to solve a bug
Closes #8
Merge branch 'bugfix-#8' into enhancement-#5