Merge branch 'master' into install
Merge pull request #3 from pinoniq/install

Merge branch 'master' into install