Merge pull request #5 from arianagiorgi/master

put properties
Merge pull request #4 from hylbyj/master

Merge pull request #5 from arianagiorgi/master