Some fixes (see changelog)
Merge pull request #1 from mambax7/master

Some fixes (see changelog)