Fixes #150
Merge branch 'fresh' of github.com:aristath/shoestrap into fresh