Keeping up to date
Merge pull request #12 from gempio/master

Keeping up to date