Fixed #9.
Merge branch 'hotfix/1.3.0pl2'