Fixed hotbug #29.
Merge branch 'hotfix/1.0.4'