bugfixing 'Undefined' warnings
Merge branch 'master' of github.com:aristath/shoestrap