slighyly quicker
Merge branch 'master' of https://github.com/Niftykins/wally