0.15.0
Merge pull request #213 from penguinho/master

0.15.0