commiting changes to contact loop before merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from gthetwong/master

Added checks for contacts