Refactored code
Added minified script
Merge remote-tracking branch 'origin'