Merge pull request #220 from hynek/release-15

Release 0.15