Merge pull request #1 from gelisam/master

Merge last commits