Renamed package
Merge branch 'master' of git@github.com:haikion/guillotine.git