Merge pull request #50 from diantahoc/master

Merging before release
Small, but important fixes
Final changes