Merge pull request #2 from Gluewine/master

Merge from Gluewine/Gluewine