Fixed #2

Switched properties from using C/C++ macros to using mkprop.