Fix bugs from to design pattern change
Merge pull request #16 from mtzeka/master

v1.43