Added docstrings for @properties
Merge branch 'issue9' into dev