added the smoke test
Merge remote-tracking branch 'upstream/master'
Implomented the Jolly Roger