Correctly map ActiveRecord relations
Merge branch 'develop'
Bump version to 0.2.1