Closes #195
Not backwards compatible. Merge this after 1.0.2 so that 1.0.2 still gets bugfixes/improvements.