Fix bug #1
Merge branch 'fix#1'