Fix for Mr Andri Olafsson
Merge branch 'master' of https://github.com/7oi/whoopshop