Added minified version
Merge remote-tracking branch 'upstream/master'
Merging Nathan's changes in with my own