Fixed hotbug #31.
Merge branch 'hotfix/1.0.5'