Fix #12
Merge branch 'fix-bug12'