Merge pull request #23 from bluss/next

0.1.14