Merge pull request #53 from alex-deaconu/master

[feature] Updated variables and fixed issues