Merge pull request #27 from ScotterC/association-belongs-bug

Association belongs bug
Merge pull request #28 from ScotterC/more-nil-checks

More nil checks
updated changelog and bumped version