Merge pull request #9 from andrie/master

Pull changes in Andrie's fork
Merge pull request #10 from andrie/master

Pull changes in Andrie's fork
Merge pull request #11 from andrie/master

Pull changes in Andrie's fork
Merge pull request #4 from RevoEnhancements/master

Merge pull request #9 from andrie/master