fix slappage bug
Merge remote-tracking branch 'philsong/master'