Attempt at providing alignment (see #108)

This is my first go at it.
First PR ever, so please forgive anything that might not follow the general rules.

Very open to suggestions and criticism.
I wondered if a new class had to be created for the property content parsing...

Thanks