Merge pull request #1 from jadar/master

update
No need for sets when collections work just fine

also fixed a couple of privates that should of been public
Merge pull request #35 from CaptainShadows/master

Final cleanup from CaptainShadows