Version 0.1.183

* Code refactoring, issue #150, #188 and #189