Updated Minified Version with fixes for issue #22