Merge pull request #2 from lamuertepeluda/master

Upgrade and new features