Merge pull request #1 from Gluewine/master

merge