Complete shelf #4
Merge pull request #13 from matiassingers/patch-4

Complete shelf #4