#18 - Implement prefix free property names

Should fix #18