1.2.0
Merge pull request #339 from penguinho/master

1.2.0