Fixes #9 and breaks API for property names