Merge pull request #13 from sinagaboni/master

Merge