Merge pull request #2 from Gluewine/master

Merge from Gluewine/Gluewine
Merge pull request #20 from sergeds/master

Merge pull request #2 from Gluewine/master