Issue160

Fixes #160. Well it will when it's done...