Code refactoring.
Update to version 1.0.6