Fixes #79
Fixes #80
Minified files