Rewrote the way properties are serialized.  Updated README.
Merge branch 'dev'