Added short arguments
Merge branch 'master' of github.com:nathanpc/pinned