Merge pull request #5 from Gluewine/master

Merge from Gluewine/Gluewine