update to guillotine 1.4.0
Merge pull request #1 from wuotr/master

Update guillotine to 1.4.0