Fixes #2 bug
Merge branch 'to-solve-bug-02'