Merge pull request #1 from linino/master

Merge from upstream