Merge pull request #2 from jcoleman/master

merged latest jcoleman master
fixed wrong sentinelMaster assignment
Merge pull request #53 from peh/master

Fixed setSentinelMaster mis-assignment.