Fix issue #4
Merge branch 'master' of https://github.com/RicardovanTongeren/sandwich