Monkey-patch #11, bump to 0.4.0