Merge pull request #4 from arieldiamond/master

Merge pull request #3 from arieldiamond/associations
Merge pull request #5 from arieldiamond/associations

Merge pull request #4 from arieldiamond/master