Fix #15
Merge branch 'master' of github.com:wpmu/shoestrap