Merge branch 'master' into add-unlink-4

This PR closes #4 . See discussion here: https://trello.com/c/Cu82hRNH/95-dribbble-produces-error-and-is-missing-unlink-button