Reorder properties
Use new style for comments
Bump version to 0.3.1