Merge pull request #26 from alex-deaconu/master

[fix] Undoing last commit