Merge pull request #1 from pdegeus/master

Merged from upstream