Fix some retain cycles
Merge pull request #156 from joshvera/patch-1

Fix some retain cycles