Merge pull request #1 from squera/master

Pulling into 1 branch