Merge pull request #1 from gelisam/master

Merge last commits
Merge pull request #55 from melrief/master

Merge pull request #1 from gelisam/master