added parameter to checkin
fixed syntax
Merge remote-tracking branch 'upstream/master'
Merge pull request #145 from jmoborn/master

Fixed my mistakes
fixing merge conflicts