fixes #495
Merge branch 'development' of github.com:shoestrap/shoestrap-3 into development