fix bug #9
Merge commit '34a6b83'