Merge pull request #5 from Gluewine/master

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

Merge pull request #5 from Gluewine/master