Merge pull request #4 from RevoEnhancements/master

Merge pull request #9 from andrie/master
Merge pull request #12 from andrie/master

Merge pull request #4 from RevoEnhancements/master