Merge pull request #188 from rdesfo/0.23

0.23