Merged in parts of master that somehow got left out
Merge pull request #22 from claydotio/drawer

Merged in parts of master that somehow got left out