Merge pull request #67 from alex-deaconu/master

[feature] More refactoring and bug fixes