diff --git a/README.md b/README.md
index 1d422419..f05962ea 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ Amplitude-Javascript
 
         <script type="text/javascript">
           (function(h,a){var f=h.amplitude||{};var b=a.createElement("script");b.type="text/javascript";
-          b.async=true;b.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.1-min.js";
+          b.async=true;b.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.2-min.js";
           var g=a.getElementsByTagName("script")[0];g.parentNode.insertBefore(b,g);
           f._q=[];function e(i){f[i]=function(){f._q.push([i].concat(Array.prototype.slice.call(arguments,0)))}}
-          var c=["init","logEvent","setUserId","setGlobalUserProperties","setVersionName","setDomain"];
+          var c=["init","logEvent","setUserId","setUserProperties","setVersionName","setDomain","setGlobalUserProperties"];
           for(var d=0;d<c.length;d++){e(c[d])}h.amplitude=f})(window,document);
 
           amplitude.init("YOUR_API_KEY_HERE");
@@ -43,15 +43,15 @@ You can also add the user ID as an argument to the `init` call:
 
 You can attach additional data to any event by passing a Javascript object as the second argument to `logEvent`:
 
-    var customProperties = {};
-    customProperties.key = "value";
-    amplitude.logEvent("EVENT_IDENTIFIER_HERE", customProperties);
+    var eventProperties = {};
+    eventProperties.key = "value";
+    amplitude.logEvent("EVENT_IDENTIFIER_HERE", eventProperties);
 
-To add properties that are tracked in every event, you can set global properties for a user:
+To add properties that are tracked in every event, you can set properties for a user:
 
-    var globalProperties = {};
-    globalProperties.key = "value";
-    amplitude.setGlobalUserProperties(globalProperties);
+    var userProperties = {};
+    userProperties.key = "value";
+    amplitude.setUserProperties(userProperties);
 
 # Configuration Options #
 
diff --git a/amplitude-1.2-min.js b/amplitude-1.2-min.js
new file mode 100644
index 00000000..1b65d57d
--- /dev/null
+++ b/amplitude-1.2-min.js
@@ -0,0 +1 @@
+(function(window,document){var log=function(s){console.log("[Amplitude] "+s)};var isArray=Array.isArray||function(obj){return Object.prototype.toString.call(obj)==="[object Array]"};var queryString=function(p){var pairs=[];for(var key in p){var value=p[key];if(isArray(value)){for(var i=0;i<value.length;i++){pairs.push(encodeURIComponent(key)+"="+encodeURIComponent(value[i]))}}else{pairs.push(encodeURIComponent(key)+"="+encodeURIComponent(value))}}return pairs.join("&")};var UUID=function(){var s=[];for(var i=0;i<32;i++){s[i]=Math.floor(Math.random()*16).toString(16)}var uuid=s.join("");return uuid};var localStorage;if(window.localStorage){localStorage=window.localStorage}else{if(window.globalStorage){try{localStorage=window.globalStorage[window.location.hostname]}catch(e){}}else{var div=document.createElement("div"),attrKey="localStorage";div.style.display="none";document.getElementsByTagName("head")[0].appendChild(div);if(div.addBehavior){div.addBehavior("#default#userdata");localStorage={length:0,setItem:function(k,v){div.load(attrKey);if(!div.getAttribute(k)){this.length++}div.setAttribute(k,v);div.save(attrKey)},getItem:function(k){div.load(attrKey);return div.getAttribute(k)},removeItem:function(k){div.load(attrKey);if(div.getAttribute(k)){this.length--}div.removeAttribute(k);div.save(attrKey)},clear:function(){div.load(attrKey);var i=0;var attr;while(attr=div.XMLDocument.documentElement.attributes[i++]){div.removeAttribute(attr.name)}div.save(attrKey);this.length=0},key:function(k){div.load(attrKey);return div.XMLDocument.documentElement.attributes[k]}};div.load(attrKey);localStorage.length=div.XMLDocument.documentElement.attributes.length}else{}}}if(!localStorage){localStorage={length:0,setItem:function(k,v){},getItem:function(k){},removeItem:function(k){},clear:function(){},key:function(k){}}}var UTF8={encode:function(s){s=s.replace(/\r\n/g,"\n");var utftext="";for(var n=0;n<s.length;n++){var c=s.charCodeAt(n);if(c<128){utftext+=String.fromCharCode(c)}else{if((c>127)&&(c<2048)){utftext+=String.fromCharCode((c>>6)|192);utftext+=String.fromCharCode((c&63)|128)}else{utftext+=String.fromCharCode((c>>12)|224);utftext+=String.fromCharCode(((c>>6)&63)|128);utftext+=String.fromCharCode((c&63)|128)}}}return utftext},decode:function(utftext){var s="";var i=0;var c=0,c1=0,c2=0;while(i<utftext.length){c=utftext.charCodeAt(i);if(c<128){s+=String.fromCharCode(c);i++}else{if((c>191)&&(c<224)){c1=utftext.charCodeAt(i+1);s+=String.fromCharCode(((c&31)<<6)|(c1&63));i+=2}else{c1=utftext.charCodeAt(i+1);c2=utftext.charCodeAt(i+2);s+=String.fromCharCode(((c&15)<<12)|((c1&63)<<6)|(c2&63));i+=3}}}return s}};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(input){try{if(window.btoa&&window.atob){return window.btoa(unescape(encodeURIComponent(input)))}}catch(e){}return Base64._encode(input)},_encode:function(input){var output="";var chr1,chr2,chr3,enc1,enc2,enc3,enc4;var i=0;input=UTF8.encode(input);while(i<input.length){chr1=input.charCodeAt(i++);chr2=input.charCodeAt(i++);chr3=input.charCodeAt(i++);enc1=chr1>>2;enc2=((chr1&3)<<4)|(chr2>>4);enc3=((chr2&15)<<2)|(chr3>>6);enc4=chr3&63;if(isNaN(chr2)){enc3=enc4=64}else{if(isNaN(chr3)){enc4=64}}output=output+Base64._keyStr.charAt(enc1)+Base64._keyStr.charAt(enc2)+Base64._keyStr.charAt(enc3)+Base64._keyStr.charAt(enc4)}return output},decode:function(input){try{if(window.btoa&&window.atob){return decodeURIComponent(escape(window.atob(input)))}}catch(e){}return Base64._decode(input)},_decode:function(input){var output="";var chr1,chr2,chr3;var enc1,enc2,enc3,enc4;var i=0;input=input.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(i<input.length){enc1=Base64._keyStr.indexOf(input.charAt(i++));enc2=Base64._keyStr.indexOf(input.charAt(i++));enc3=Base64._keyStr.indexOf(input.charAt(i++));enc4=Base64._keyStr.indexOf(input.charAt(i++));chr1=(enc1<<2)|(enc2>>4);chr2=((enc2&15)<<4)|(enc3>>2);chr3=((enc3&3)<<6)|enc4;output=output+String.fromCharCode(chr1);if(enc3!=64){output=output+String.fromCharCode(chr2)}if(enc4!=64){output=output+String.fromCharCode(chr3)}}output=UTF8.decode(output);return output}};(function(global){var md5cycle=function(x,k){var a=x[0],b=x[1],c=x[2],d=x[3];a=ff(a,b,c,d,k[0],7,-680876936);d=ff(d,a,b,c,k[1],12,-389564586);c=ff(c,d,a,b,k[2],17,606105819);b=ff(b,c,d,a,k[3],22,-1044525330);a=ff(a,b,c,d,k[4],7,-176418897);d=ff(d,a,b,c,k[5],12,1200080426);c=ff(c,d,a,b,k[6],17,-1473231341);b=ff(b,c,d,a,k[7],22,-45705983);a=ff(a,b,c,d,k[8],7,1770035416);d=ff(d,a,b,c,k[9],12,-1958414417);c=ff(c,d,a,b,k[10],17,-42063);b=ff(b,c,d,a,k[11],22,-1990404162);a=ff(a,b,c,d,k[12],7,1804603682);d=ff(d,a,b,c,k[13],12,-40341101);c=ff(c,d,a,b,k[14],17,-1502002290);b=ff(b,c,d,a,k[15],22,1236535329);a=gg(a,b,c,d,k[1],5,-165796510);d=gg(d,a,b,c,k[6],9,-1069501632);c=gg(c,d,a,b,k[11],14,643717713);b=gg(b,c,d,a,k[0],20,-373897302);a=gg(a,b,c,d,k[5],5,-701558691);d=gg(d,a,b,c,k[10],9,38016083);c=gg(c,d,a,b,k[15],14,-660478335);b=gg(b,c,d,a,k[4],20,-405537848);a=gg(a,b,c,d,k[9],5,568446438);d=gg(d,a,b,c,k[14],9,-1019803690);c=gg(c,d,a,b,k[3],14,-187363961);b=gg(b,c,d,a,k[8],20,1163531501);a=gg(a,b,c,d,k[13],5,-1444681467);d=gg(d,a,b,c,k[2],9,-51403784);c=gg(c,d,a,b,k[7],14,1735328473);b=gg(b,c,d,a,k[12],20,-1926607734);a=hh(a,b,c,d,k[5],4,-378558);d=hh(d,a,b,c,k[8],11,-2022574463);c=hh(c,d,a,b,k[11],16,1839030562);b=hh(b,c,d,a,k[14],23,-35309556);a=hh(a,b,c,d,k[1],4,-1530992060);d=hh(d,a,b,c,k[4],11,1272893353);c=hh(c,d,a,b,k[7],16,-155497632);b=hh(b,c,d,a,k[10],23,-1094730640);a=hh(a,b,c,d,k[13],4,681279174);d=hh(d,a,b,c,k[0],11,-358537222);c=hh(c,d,a,b,k[3],16,-722521979);b=hh(b,c,d,a,k[6],23,76029189);a=hh(a,b,c,d,k[9],4,-640364487);d=hh(d,a,b,c,k[12],11,-421815835);c=hh(c,d,a,b,k[15],16,530742520);b=hh(b,c,d,a,k[2],23,-995338651);a=ii(a,b,c,d,k[0],6,-198630844);d=ii(d,a,b,c,k[7],10,1126891415);c=ii(c,d,a,b,k[14],15,-1416354905);b=ii(b,c,d,a,k[5],21,-57434055);a=ii(a,b,c,d,k[12],6,1700485571);d=ii(d,a,b,c,k[3],10,-1894986606);c=ii(c,d,a,b,k[10],15,-1051523);b=ii(b,c,d,a,k[1],21,-2054922799);a=ii(a,b,c,d,k[8],6,1873313359);d=ii(d,a,b,c,k[15],10,-30611744);c=ii(c,d,a,b,k[6],15,-1560198380);b=ii(b,c,d,a,k[13],21,1309151649);a=ii(a,b,c,d,k[4],6,-145523070);d=ii(d,a,b,c,k[11],10,-1120210379);c=ii(c,d,a,b,k[2],15,718787259);b=ii(b,c,d,a,k[9],21,-343485551);x[0]=add32(a,x[0]);x[1]=add32(b,x[1]);x[2]=add32(c,x[2]);x[3]=add32(d,x[3])};var cmn=function(q,a,b,x,s,t){a=add32(add32(a,q),add32(x,t));return add32((a<<s)|(a>>>(32-s)),b)};var ff=function(a,b,c,d,x,s,t){return cmn((b&c)|((~b)&d),a,b,x,s,t)};var gg=function(a,b,c,d,x,s,t){return cmn((b&d)|(c&(~d)),a,b,x,s,t)};var hh=function(a,b,c,d,x,s,t){return cmn(b^c^d,a,b,x,s,t)};var ii=function(a,b,c,d,x,s,t){return cmn(c^(b|(~d)),a,b,x,s,t)};var md51=function(s){var txt="",n=s.length,state=[1732584193,-271733879,-1732584194,271733878],i;for(i=64;i<=s.length;i+=64){md5cycle(state,md5blk(s.substring(i-64,i)))}s=s.substring(i-64);var tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(i=0;i<s.length;i++){tail[i>>2]|=s.charCodeAt(i)<<((i%4)<<3)}tail[i>>2]|=128<<((i%4)<<3);if(i>55){md5cycle(state,tail);for(i=0;i<16;i++){tail[i]=0}}tail[14]=n*8;md5cycle(state,tail);return state};var md5blk=function(s){var md5blks=[],i;for(i=0;i<64;i+=4){md5blks[i>>2]=s.charCodeAt(i)+(s.charCodeAt(i+1)<<8)+(s.charCodeAt(i+2)<<16)+(s.charCodeAt(i+3)<<24)}return md5blks};var hex_chr="0123456789abcdef".split("");var rhex=function(n){var s="",j=0;for(;j<4;j++){s+=hex_chr[(n>>(j*8+4))&15]+hex_chr[(n>>(j*8))&15]}return s};var hex=function(x){for(var i=0;i<x.length;i++){x[i]=rhex(x[i])}return x.join("")};var md5=global.md5=function(s){return hex(md51(s))};var add32=function(a,b){return(a+b)&4294967295};if(md5("hello")!="5d41402abc4b2a76b9719d911017c592"){var add32=function(x,y){var lsw=(x&65535)+(y&65535),msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&65535)}}})(window);var JSON=window.JSON;if(typeof JSON!=="object"){JSON={}}(function(){function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){if(typeof rep[i]==="string"){k=rep[i];v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof JSON.stringify!=="function"){JSON.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("JSON.stringify")}return str("",{"":value})}}if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());var userAgent=navigator.userAgent;var vendor=navigator.vendor;var platform=navigator.platform;var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||null;this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||null;this.OS=this.searchString(this.dataOS)||null},searchString:function(data){for(var i=0;i<data.length;i++){var dataString=data[i].string;var dataProp=data[i].prop;this.versionSearchString=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1){return data[i].identity}}else{if(dataProp){return data[i].identity}}}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1){return}return parseFloat(dataString.substring(index+this.versionSearchString.length+1))},dataBrowser:[{string:userAgent,subString:"Chrome",identity:"Chrome"},{string:userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera",versionSearch:"Version"},{string:vendor,subString:"iCab",identity:"iCab"},{string:vendor,subString:"KDE",identity:"Konqueror"},{string:userAgent,subString:"Firefox",identity:"Firefox"},{string:vendor,subString:"Camino",identity:"Camino"},{string:userAgent,subString:"Netscape",identity:"Netscape"},{string:userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:userAgent,subString:"Gecko",identity:"Mozilla",versionSearch:"rv"},{string:userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:platform,subString:"Win",identity:"Windows"},{string:platform,subString:"Mac",identity:"Mac"},{string:userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:userAgent,subString:"Android",identity:"Android"},{string:platform,subString:"Linux",identity:"Linux"}]};BrowserDetect.init();var Request=function(url,data){this.url=url;this.data=data||{}};Request.prototype.send=function(callback){var isIE=window.XDomainRequest?true:false;if(isIE){var xdr=new window.XDomainRequest();xdr.open("POST",this.url,true);xdr.onload=function(){callback(xdr.responseText)};xdr.send(queryString(this.data))}else{var xhr=new XMLHttpRequest();xhr.open("POST",this.url,true);xhr.onreadystatechange=function(){if(xhr.readyState==4){if(xhr.status==200){callback(xhr.responseText)}}};xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");xhr.send(queryString(this.data))}};var Cookie={get:function(name){var nameEq=name+"=";var ca=document.cookie.split(";");for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==" "){c=c.substring(1,c.length)}if(c.indexOf(nameEq)==0){return c.substring(nameEq.length,c.length)}}return null},set:function(name,value,days,domain){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString()}else{var expires=""}var cookieString=name+"="+value+expires+"; path=/"+(domain?(";domain="+domain):"");document.cookie=cookieString},remove:function(name,domain){Cookie.set(name,"",-1,domain)}};var Amplitude=function(){};Amplitude.SDK_VERSION="1.2";Amplitude.API_VERSION=2;var options={apiEndpoint:"api.amplitude.com",cookieName:"amplitude_id",cookieExpiration:365*10,unsentKey:"amplitude_unsent",saveEvents:true,domain:""};var eventId=0;var unsentEvents=[];var sending=false;var nextEventId=function(){eventId++;return eventId};Amplitude.prototype.init=function(apiKey,opt_userId,opt_config){try{this.options=options;options.apiKey=apiKey;if(opt_config){if(opt_config.saveEvents!==undefined){options.saveEvents=!!opt_config.saveEvents}}loadCookieData();options.deviceId=options.deviceId||UUID();options.userId=(opt_userId!==undefined&&opt_userId!==null&&opt_userId)||options.userId||null;saveCookieData();eventId=0;if(options.saveEvents){var savedUnsentEventsString=localStorage.getItem(options.unsentKey);if(savedUnsentEventsString){try{unsentEvents=JSON.parse(savedUnsentEventsString)}catch(e){}}}if(unsentEvents.length>0){this.sendEvents()}}catch(e){log(e)}};var loadCookieData=function(){var cookie=Cookie.get(options.cookieName);var cookieData=null;if(cookie){try{cookieData=JSON.parse(Base64.decode(cookie));if(cookieData){if(cookieData.deviceId){options.deviceId=cookieData.deviceId}if(cookieData.userId){options.userId=cookieData.userId}if(cookieData.globalUserProperties){options.globalUserProperties=cookieData.globalUserProperties}}}catch(e){}}};var saveCookieData=function(){Cookie.set(options.cookieName,Base64.encode(JSON.stringify({deviceId:options.deviceId,userId:options.userId,globalUserProperties:options.globalUserProperties})),options.cookieExpiration,options.domain)};var saveEvents=function(){try{localStorage.setItem(options.unsentKey,JSON.stringify(unsentEvents))}catch(e){}};Amplitude.prototype.setDomain=function(domain){try{options.domain=(domain!==undefined&&domain!==null&&(""+domain))||null;options.cookieName="amplitude_id"+(options.domain||"");loadCookieData();saveCookieData()}catch(e){log(e)}};Amplitude.prototype.setUserId=function(userId){try{options.userId=(userId!==undefined&&userId!==null&&(""+userId))||null;saveCookieData()}catch(e){log(e)}};Amplitude.prototype.setUserProperties=function(userProperties){try{options.globalUserProperties=userProperties;saveCookieData()}catch(e){log(e)}};Amplitude.prototype.setVersionName=function(versionName){try{options.versionName=versionName}catch(e){log(e)}};Amplitude.prototype.logEvent=function(eventType,eventProperties){try{var eventTime=new Date().getTime();eventProperties=eventProperties||{};var event={device_id:options.deviceId,user_id:options.userId||options.deviceId,timestamp:eventTime,event_id:nextEventId(),session_id:-1,event_type:eventType,client:BrowserDetect.browser,version_code:0,version_name:options.versionName||null,build_version_sdk:0,build_version_release:BrowserDetect.version,phone_model:BrowserDetect.OS,custom_properties:eventProperties,global_properties:options.globalUserProperties||{}};unsentEvents.push(event);if(options.saveEvents){saveEvents()}this.sendEvents()}catch(e){log(e)}};Amplitude.prototype.sendEvents=function(){if(!sending){sending=true;var url=("https:"==window.location.protocol?"https":"http")+"://"+options.apiEndpoint+"/";var events=JSON.stringify(unsentEvents);var uploadTime=new Date().getTime();var data={client:options.apiKey,e:events,v:Amplitude.API_VERSION,upload_time:uploadTime,checksum:md5(Amplitude.API_VERSION+options.apiKey+events+uploadTime)};var numEvents=unsentEvents.length;var scope=this;new Request(url,data).send(function(response){sending=false;try{if(JSON.parse(response).added==numEvents){unsentEvents.splice(0,numEvents);if(options.saveEvents){saveEvents()}if(unsentEvents.length>0){scope.sendEvents()}}}catch(e){}})}};Amplitude.prototype.setGlobalUserProperties=Amplitude.prototype.setUserProperties;var old=window.amplitude||{};var q=old._q||[];var instance=new Amplitude();window.amplitude=instance;for(var i=0;i<q.length;i++){var fn=instance[q[i][0]];fn&&fn.apply(instance,q[i].slice(1))}})(window,document);
\ No newline at end of file
diff --git a/amplitude-1.2-snippet-min.js b/amplitude-1.2-snippet-min.js
new file mode 100644
index 00000000..f385ee19
--- /dev/null
+++ b/amplitude-1.2-snippet-min.js
@@ -0,0 +1 @@
+(function(h,a){var f=h.amplitude||{};var b=a.createElement("script");b.type="text/javascript";b.async=true;b.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.2-min.js";var g=a.getElementsByTagName("script")[0];g.parentNode.insertBefore(b,g);f._q=[];function e(i){f[i]=function(){f._q.push([i].concat(Array.prototype.slice.call(arguments,0)))}}var c=["init","logEvent","setUserId","setUserProperties","setVersionName","setDomain","setGlobalUserProperties"];for(var d=0;d<c.length;d++){e(c[d])}h.amplitude=f})(window,document);
\ No newline at end of file
diff --git a/src/amplitude-snippet.js b/src/amplitude-snippet.js
index 495ab0ef..370fdd75 100644
--- a/src/amplitude-snippet.js
+++ b/src/amplitude-snippet.js
@@ -9,7 +9,7 @@
   var as = document.createElement('script');
   as.type = 'text/javascript';
   as.async = true;
-  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.0-min.js';
+  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.2-min.js';
   var s = document.getElementsByTagName('script')[0];
   s.parentNode.insertBefore(as, s);
   amplitude._q = [];
@@ -18,7 +18,7 @@
       amplitude._q.push([fn].concat(Array.prototype.slice.call(arguments, 0)));
     };
   }
-  var funcs = ["init", "logEvent", "setUserId", "setGlobalUserProperties", "setVersionName", "setDomain"];
+  var funcs = ["init", "logEvent", "setUserId", "setUserProperties", "setVersionName", "setDomain", "setGlobalUserProperties"];
   for (var i = 0; i < funcs.length; i++) {
     proxy(funcs[i]);
   };
diff --git a/src/amplitude.js b/src/amplitude.js
index d8bd1775..159f061c 100644
--- a/src/amplitude.js
+++ b/src/amplitude.js
@@ -3,7 +3,7 @@
  * Javascript SDK for Amplitude
  *
  * Created by Curtis Liu
- * Copyright (c) 2013 Sonalight, Inc. All rights reserved.
+ * Copyright (c) 2014 Sonalight, Inc. All rights reserved.
  */
 (function(window, document) {
 
@@ -271,6 +271,200 @@
         }
     };
 
+    /*
+     * MD5 Implementation
+     * http://www.myersdaily.org/joseph/javascript/md5-text.html
+     */
+    (function (global) {
+
+      var md5cycle = function (x, k) {
+        var a = x[0],
+          b = x[1],
+          c = x[2],
+          d = x[3];
+
+        a = ff(a, b, c, d, k[0], 7, -680876936);
+        d = ff(d, a, b, c, k[1], 12, -389564586);
+        c = ff(c, d, a, b, k[2], 17, 606105819);
+        b = ff(b, c, d, a, k[3], 22, -1044525330);
+        a = ff(a, b, c, d, k[4], 7, -176418897);
+        d = ff(d, a, b, c, k[5], 12, 1200080426);
+        c = ff(c, d, a, b, k[6], 17, -1473231341);
+        b = ff(b, c, d, a, k[7], 22, -45705983);
+        a = ff(a, b, c, d, k[8], 7, 1770035416);
+        d = ff(d, a, b, c, k[9], 12, -1958414417);
+        c = ff(c, d, a, b, k[10], 17, -42063);
+        b = ff(b, c, d, a, k[11], 22, -1990404162);
+        a = ff(a, b, c, d, k[12], 7, 1804603682);
+        d = ff(d, a, b, c, k[13], 12, -40341101);
+        c = ff(c, d, a, b, k[14], 17, -1502002290);
+        b = ff(b, c, d, a, k[15], 22, 1236535329);
+
+        a = gg(a, b, c, d, k[1], 5, -165796510);
+        d = gg(d, a, b, c, k[6], 9, -1069501632);
+        c = gg(c, d, a, b, k[11], 14, 643717713);
+        b = gg(b, c, d, a, k[0], 20, -373897302);
+        a = gg(a, b, c, d, k[5], 5, -701558691);
+        d = gg(d, a, b, c, k[10], 9, 38016083);
+        c = gg(c, d, a, b, k[15], 14, -660478335);
+        b = gg(b, c, d, a, k[4], 20, -405537848);
+        a = gg(a, b, c, d, k[9], 5, 568446438);
+        d = gg(d, a, b, c, k[14], 9, -1019803690);
+        c = gg(c, d, a, b, k[3], 14, -187363961);
+        b = gg(b, c, d, a, k[8], 20, 1163531501);
+        a = gg(a, b, c, d, k[13], 5, -1444681467);
+        d = gg(d, a, b, c, k[2], 9, -51403784);
+        c = gg(c, d, a, b, k[7], 14, 1735328473);
+        b = gg(b, c, d, a, k[12], 20, -1926607734);
+
+        a = hh(a, b, c, d, k[5], 4, -378558);
+        d = hh(d, a, b, c, k[8], 11, -2022574463);
+        c = hh(c, d, a, b, k[11], 16, 1839030562);
+        b = hh(b, c, d, a, k[14], 23, -35309556);
+        a = hh(a, b, c, d, k[1], 4, -1530992060);
+        d = hh(d, a, b, c, k[4], 11, 1272893353);
+        c = hh(c, d, a, b, k[7], 16, -155497632);
+        b = hh(b, c, d, a, k[10], 23, -1094730640);
+        a = hh(a, b, c, d, k[13], 4, 681279174);
+        d = hh(d, a, b, c, k[0], 11, -358537222);
+        c = hh(c, d, a, b, k[3], 16, -722521979);
+        b = hh(b, c, d, a, k[6], 23, 76029189);
+        a = hh(a, b, c, d, k[9], 4, -640364487);
+        d = hh(d, a, b, c, k[12], 11, -421815835);
+        c = hh(c, d, a, b, k[15], 16, 530742520);
+        b = hh(b, c, d, a, k[2], 23, -995338651);
+
+        a = ii(a, b, c, d, k[0], 6, -198630844);
+        d = ii(d, a, b, c, k[7], 10, 1126891415);
+        c = ii(c, d, a, b, k[14], 15, -1416354905);
+        b = ii(b, c, d, a, k[5], 21, -57434055);
+        a = ii(a, b, c, d, k[12], 6, 1700485571);
+        d = ii(d, a, b, c, k[3], 10, -1894986606);
+        c = ii(c, d, a, b, k[10], 15, -1051523);
+        b = ii(b, c, d, a, k[1], 21, -2054922799);
+        a = ii(a, b, c, d, k[8], 6, 1873313359);
+        d = ii(d, a, b, c, k[15], 10, -30611744);
+        c = ii(c, d, a, b, k[6], 15, -1560198380);
+        b = ii(b, c, d, a, k[13], 21, 1309151649);
+        a = ii(a, b, c, d, k[4], 6, -145523070);
+        d = ii(d, a, b, c, k[11], 10, -1120210379);
+        c = ii(c, d, a, b, k[2], 15, 718787259);
+        b = ii(b, c, d, a, k[9], 21, -343485551);
+
+        x[0] = add32(a, x[0]);
+        x[1] = add32(b, x[1]);
+        x[2] = add32(c, x[2]);
+        x[3] = add32(d, x[3]);
+
+      }
+
+      var cmn = function (q, a, b, x, s, t) {
+        a = add32(add32(a, q), add32(x, t));
+        return add32((a << s) | (a >>> (32 - s)), b);
+      }
+
+      var ff = function (a, b, c, d, x, s, t) {
+        return cmn((b & c) | ((~b) & d), a, b, x, s, t);
+      }
+
+      var gg = function (a, b, c, d, x, s, t) {
+        return cmn((b & d) | (c & (~d)), a, b, x, s, t);
+      }
+
+      var hh = function (a, b, c, d, x, s, t) {
+        return cmn(b ^ c ^ d, a, b, x, s, t);
+      }
+
+      var ii = function (a, b, c, d, x, s, t) {
+        return cmn(c ^ (b | (~d)), a, b, x, s, t);
+      }
+
+      var md51 = function (s) {
+        var txt = '',
+          n = s.length,
+          state = [1732584193, -271733879, -1732584194, 271733878],
+          i;
+        for (i = 64; i <= s.length; i += 64) {
+          md5cycle(state, md5blk(s.substring(i - 64, i)));
+        }
+        s = s.substring(i - 64);
+        var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        for (i = 0; i < s.length; i++)
+          tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
+        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
+        if (i > 55) {
+          md5cycle(state, tail);
+          for (i = 0; i < 16; i++) tail[i] = 0;
+        }
+        tail[14] = n * 8;
+        md5cycle(state, tail);
+        return state;
+      }
+
+      /* there needs to be support for Unicode here,
+       * unless we pretend that we can redefine the MD-5
+       * algorithm for multi-byte characters (perhaps
+       * by adding every four 16-bit characters and
+       * shortening the sum to 32 bits). Otherwise
+       * I suggest performing MD-5 as if every character
+       * was two bytes--e.g., 0040 0025 = @%--but then
+       * how will an ordinary MD-5 sum be matched?
+       * There is no way to standardize text to something
+       * like UTF-8 before transformation; speed cost is
+       * utterly prohibitive. The JavaScript standard
+       * itself needs to look at this: it should start
+       * providing access to strings as preformed UTF-8
+       * 8-bit unsigned value arrays.
+       */
+      var md5blk = function (s) { /* I figured global was faster.   */
+        var md5blks = [],
+          i; /* Andy King said do it this way. */
+        for (i = 0; i < 64; i += 4) {
+          md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
+        }
+        return md5blks;
+      }
+
+      var hex_chr = '0123456789abcdef'.split('');
+
+      var rhex = function (n) {
+        var s = '',
+          j = 0;
+        for (; j < 4; j++)
+          s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] + hex_chr[(n >> (j * 8)) & 0x0F];
+        return s;
+      }
+
+      var hex = function (x) {
+        for (var i = 0; i < x.length; i++)
+          x[i] = rhex(x[i]);
+        return x.join('');
+      }
+
+      var md5 = global.md5 = function (s) {
+        return hex(md51(s));
+      }
+
+      /* this function is much faster,
+      so if possible we use it. Some IEs
+      are the only ones I know of that
+      need the idiotic second function,
+      generated by an if clause.  */
+
+      var add32 = function (a, b) {
+        return (a + b) & 0xFFFFFFFF;
+      }
+
+      if (md5('hello') != '5d41402abc4b2a76b9719d911017c592') {
+        var add32 = function (x, y) {
+          var lsw = (x & 0xFFFF) + (y & 0xFFFF),
+            msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+          return (msw << 16) | (lsw & 0xFFFF);
+        }
+      }
+
+    })(window);
+
     /*
      * JSON stringify/parse
      * https://github.com/douglascrockford/JSON-js
@@ -807,6 +1001,8 @@
      * Amplitude API
      */
     var Amplitude = function() {};
+    Amplitude.SDK_VERSION = "1.2";
+    Amplitude.API_VERSION = 2;
 
     var options = {
         apiEndpoint: 'api.amplitude.com',
@@ -911,7 +1107,7 @@
     };
 
     Amplitude.prototype.setDomain = function(domain) {
-        try {        
+        try {
             options.domain = (domain !== undefined && domain !== null && ('' + domain)) || null;
             options.cookieName = "amplitude_id" + (options.domain || '');
             loadCookieData();
@@ -923,7 +1119,7 @@
     };
 
     Amplitude.prototype.setUserId = function(userId) {
-        try {        
+        try {
             options.userId = (userId !== undefined && userId !== null && ('' + userId)) || null;
             saveCookieData();
             //log('set userId=' + userId);
@@ -932,11 +1128,11 @@
         }
     };
 
-    Amplitude.prototype.setGlobalUserProperties = function(globalUserProperties) {
+    Amplitude.prototype.setUserProperties = function(userProperties) {
         try {
-            options.globalUserProperties = globalUserProperties;
+            options.globalUserProperties = userProperties;
             saveCookieData();
-            //log('set globalUserProperties=' + JSON.stringify(globalUserProperties));
+            //log('set userProperties=' + JSON.stringify(userProperties));
         } catch (e) {
             log(e);
         }
@@ -951,10 +1147,10 @@
         }
     };
 
-    Amplitude.prototype.logEvent = function(eventType, customProperties) {
+    Amplitude.prototype.logEvent = function(eventType, eventProperties) {
         try {
             var eventTime = new Date().getTime();
-            customProperties = customProperties || {};
+            eventProperties = eventProperties || {};
             var event = {
                 device_id: options.deviceId,
                 user_id: options.userId || options.deviceId,
@@ -973,7 +1169,7 @@
                 // phone_manufacturer: null,
                 // phone_brand: null,
                 phone_model: BrowserDetect.OS,
-                custom_properties: customProperties,
+                custom_properties: eventProperties,
                 global_properties: options.globalUserProperties || {}
                 // country: null,
                 // language: null,
@@ -983,7 +1179,7 @@
             if (options.saveEvents) {
                 saveEvents();
             }
-            //log('logged eventType=' + eventType + ', properties=' + JSON.stringify(customProperties));
+            //log('logged eventType=' + eventType + ', properties=' + JSON.stringify(eventProperties));
             this.sendEvents();
         } catch (e) {
             log(e);
@@ -995,10 +1191,15 @@
             sending = true;
             var url = ('https:' == window.location.protocol ? 'https' : 'http') + '://' +
                 options.apiEndpoint + '/';
+            var events = JSON.stringify(unsentEvents);
+            var uploadTime = new Date().getTime();
             var data = {
                 client: options.apiKey,
-                e: JSON.stringify(unsentEvents)
-            }
+                e: events,
+                v: Amplitude.API_VERSION,
+                upload_time: uploadTime,
+                checksum: md5(Amplitude.API_VERSION + options.apiKey + events + uploadTime)
+            };
             var numEvents = unsentEvents.length;
             var scope = this;
             new Request(url, data).send(function(response) {
@@ -1021,6 +1222,11 @@
         }
     };
 
+    /**
+     *  @deprecated
+     */
+    Amplitude.prototype.setGlobalUserProperties = Amplitude.prototype.setUserProperties;
+
     var old = window.amplitude || {};
     var q = old._q || [];
     var instance = new Amplitude();
diff --git a/test/amplitudejs.html b/test/amplitudejs.html
index 78d91b60..5e24354a 100644
--- a/test/amplitudejs.html
+++ b/test/amplitudejs.html
@@ -1,7 +1,7 @@
 <html>
   <script>
-  (function(e,t){var n=e.amplitude||{};var r=t.createElement("script");r.type="text/javascript";r.async=true;r.src="amplitude.js";var a=t.getElementsByTagName("script")[0];a.parentNode.insertBefore(r,a);n._q=[];function s(e){n[e]=function(){n._q.push([e].concat(Array.prototype.slice.call(arguments,0)))}}var i=["init","logEvent","setUserId","setGlobalUserProperties","setVersionName"];for(var o=0;o<i.length;o++){s(i[o])}e.amplitude=n})(window,document);
-  amplitude.init('cf0bd9e2349a13e7562e7e47f8799f4a');
+  (function(h,a){var f=h.amplitude||{};var b=a.createElement("script");b.type="text/javascript";b.async=true;b.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-1.2-min.js";var g=a.getElementsByTagName("script")[0];g.parentNode.insertBefore(b,g);f._q=[];function e(i){f[i]=function(){f._q.push([i].concat(Array.prototype.slice.call(arguments,0)))}}var c=["init","logEvent","setUserId","setUserProperties","setVersionName","setDomain","setGlobalUserProperties"];for(var d=0;d<c.length;d++){e(c[d])}h.amplitude=f})(window,document);
+  amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053');
   amplitude.setVersionName('Web');
   //amplitude.logEvent('pageLoad');
   </script>
@@ -10,7 +10,7 @@ <h3>Amplitude JS Test</h3>
     <ul>
       <li><a href="javascript:amplitude.setUserId('user01');">Set user ID</a></li>
       <li><a href="javascript:amplitude.logEvent('clicked');">Log event</a></li>
-      <li><a href="javascript:amplitude.logEvent('clicked button', {color: 'red;', shape: 'triangle', sides: 3});">Log event with custom properties</a></li>
-      <li><a href="javascript:amplitude.setGlobalUserProperties({age: 30, city: 'San Francisco, CA'});">Set global user properties</a></li>
+      <li><a href="javascript:amplitude.logEvent('clicked button', {color: 'red;', shape: 'triangle', sides: 3});">Log event with event properties</a></li>
+      <li><a href="javascript:amplitude.setUserProperties({age: 30, city: 'San Francisco, CA'});">Set user properties</a></li>
   </body>
 </html>