merge from portfolio repo
minified versions