Merge local changes with upstream
Merge pull request #17 from andreafrost/master

Merge local changes with upstream