Update base to 1.3.1
Merge pull request #25 from rochacon/master

Update base to 1.3.1