[Update] Slash 0.1
Merge pull request #1284 from chrisdevereux/master

Slash 0.1