Merge pull request #279 from penguinho/master

1.0.0