simonpcouch merge pr #71: spring cleaning