commit message
Merge https://github.com/tinmarino/Potion