1.3.1
Merge pull request #395 from penguinho/master

1.3.1