Merge pull request #56 from alex-deaconu/master

[feature] More fixes and refactoring