Added comments
Put in overriden equals()
Merge branch 'master' of https://github.com/Ccook/conniption