diff --git a/bower.json b/bower.json
index 67da4c3f..2a17d199 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "hello",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"homepage": "http://adodson.com/hello.js/",
 	"license" : "https://github.com/MrSwitch/hello.js/blob/master/LICENSE",
 	"repository": {
diff --git a/dist/hello.all.js b/dist/hello.all.js
index 36c6c093..76db50b5 100644
--- a/dist/hello.all.js
+++ b/dist/hello.all.js
@@ -3320,6 +3320,12 @@ hello.init({
 		return o;
 	}
 
+	function formatPerson(o){
+		o.name = o.displayName || o.name;
+		o.picture = o.picture || ( o.image ? o.image.url : null);
+		o.thumbnail = o.picture;
+	}
+
 	function formatFriends(o){
 		paging(o);
 		var r = [];
@@ -3691,7 +3697,7 @@ hello.init({
 				events			: '',
 				photos			: 'https://picasaweb.google.com/data/',
 				videos			: 'http://gdata.youtube.com',
-				friends			: 'https://www.google.com/m8/feeds',
+				friends			: 'https://www.google.com/m8/feeds, https://www.googleapis.com/auth/plus.login',
 				files			: 'https://www.googleapis.com/auth/drive.readonly',
 				
 				publish			: '',
@@ -3711,9 +3717,10 @@ hello.init({
 				'me' : 'oauth2/v1/userinfo?alt=json',
 
 				// https://developers.google.com/+/api/latest/people/list
-				'me/friends' : contacts_url,
+				'me/friends' : 'plus/v1/people/me/people/visible?maxResults=@{limit|100}',
 				'me/following' : contacts_url,
 				'me/followers' : contacts_url,
+				'me/contacts' : contacts_url,
 				'me/share' : 'plus/v1/people/me/activities/public?maxResults=@{limit|100}',
 				'me/feed' : 'plus/v1/people/me/activities/public?maxResults=@{limit|100}',
 				'me/albums' : 'https://picasaweb.google.com/data/feed/api/user/default?alt=json&max-results=@{limit|100}&start-index=@{start|1}',
@@ -3776,13 +3783,23 @@ hello.init({
 						o.last_name = o.family_name || (o.name? o.name.familyName : null);
 						o.first_name = o.given_name || (o.name? o.name.givenName : null);
 	//						o.name = o.first_name + ' ' + o.last_name;
-						o.picture = o.picture || ( o.image ? o.image.url : null);
-						o.thumbnail = o.picture;
-						o.name = o.displayName || o.name;
+
+						formatPerson(o);
 					}
 					return o;
 				},
-				'me/friends'	: formatFriends,
+				'me/friends'	: function(o){
+					if(o.items){
+						paging(o);
+						o.data = o.items;
+						delete o.items;
+						for(var i=0;i<o.data.length;i++){
+							formatPerson(o.data[i]);
+						}
+					}
+					return o;
+				},
+				'me/contacts'	: formatFriends,
 				'me/followers'	: formatFriends,
 				'me/following'	: formatFriends,
 				'me/share' : function(o){
@@ -4399,8 +4416,15 @@ hello.init({
 function formatUser(o){
 	if(o.id){
 		var token = hello.getAuthResponse('windows').access_token;
-		o.email = (o.emails?o.emails.preferred:null);
-		o.thumbnail = o.picture = 'https://apis.live.net/v5.0/'+o.id+'/picture?access_token='+token;
+		if(o.emails){
+			o.email =  o.emails.preferred;
+		}
+		// If this is not an non-network friend
+		if(o.is_friend!==false){
+			// Use the id of the user_id if available
+			var id = (o.user_id||o.id);
+			o.thumbnail = o.picture = 'https://apis.live.net/v5.0/'+id+'/picture?access_token='+token;
+		}
 	}
 }
 
@@ -4462,6 +4486,7 @@ hello.init({
 			"me/friends" : "me/friends",
 			"me/following" : "me/contacts",
 			"me/followers" : "me/friends",
+			"me/contacts" : "me/contacts",
 
 			"me/albums"	: 'me/albums',
 
@@ -4500,6 +4525,7 @@ hello.init({
 				return o;
 			},
 			'me/friends' : formatFriends,
+			'me/contacts' : formatFriends,
 			'me/followers' : formatFriends,
 			'me/following' : formatFriends,
 			'me/albums' : function(o){
diff --git a/dist/hello.all.min.js b/dist/hello.all.min.js
index eb80fe3b..80b67ebb 100644
--- a/dist/hello.all.min.js
+++ b/dist/hello.all.min.js
@@ -4,10 +4,10 @@ var hello=function(e){return hello.use(e)};hello.utils={extend:function(e,t){for
 !function(e){function t(t,n,r){var o=(r?"":"flickr:")+"?method="+t+"&api_key="+e.init().flickr.id+"&format=json";for(var i in n)n.hasOwnProperty(i)&&(o+="&"+i+"="+n[i]);return o}function n(n){var r=e.getAuthResponse("flickr");r&&r.user_nsid?n(r.user_nsid):p?n(p):e.api(t("flickr.test.login"),function(e){p=c(e,"user").id,n(p)})}function r(e,r){return r||(r={}),function(o,i){n(function(n){r.user_id=n,i(t(e,r,!0))})}}function o(e,t){var n="http://www.flickr.com/images/buddyicon.gif";return e.nsid&&e.iconserver&&e.iconfarm&&(n="http://farm"+e.iconfarm+".staticflickr.com/"+e.iconserver+"/"+"buddyicons/"+e.nsid+(t?"_"+t:"")+".jpg"),n}function i(e,t,n,r,o){return o=o?"_"+o:"","http://farm"+t+".staticflickr.com/"+n+"/"+e+"_"+r+o+".jpg"}function s(e){e&&e.stat&&"ok"!=e.stat.toLowerCase()&&(e.error={code:"invalid_request",message:e.message})}function a(e){if(e.photoset||e.photos){var t="photoset"in e?"photoset":"photos";e=c(e,t),u(e),e.data=e.photo,delete e.photo;for(var n=0;n<e.data.length;n++){var r=e.data[n];r.name=r.title,r.picture=i(r.id,r.farm,r.server,r.secret,""),r.source=i(r.id,r.farm,r.server,r.secret,"b"),r.thumbnail=i(r.id,r.farm,r.server,r.secret,"m")}}return e}function c(e,t){return t in e?e=e[t]:"error"in e||(e.error={code:"invalid_request",message:e.message||"Failed to get data from Flickr"}),e}function l(e){if(s(e),e.contacts){e=c(e,"contacts"),u(e),e.data=e.contact,delete e.contact;for(var t=0;t<e.data.length;t++){var n=e.data[t];n.id=n.nsid,n.name=n.realname||n.username,n.thumbnail=o(n,"m")}}return e}function u(e){e.page&&e.pages&&e.page!==e.pages&&(e.paging={next:"?page="+ ++e.page})}var p;e.init({flickr:{name:"Flickr",oauth:{version:"1.0a",auth:"http://www.flickr.com/services/oauth/authorize?perms=read",request:"http://www.flickr.com/services/oauth/request_token",token:"http://www.flickr.com/services/oauth/access_token"},logout:function(){p=null},autorefresh:!1,base:"http://api.flickr.com/services/rest",get:{me:r("flickr.people.getInfo"),"me/friends":r("flickr.contacts.getList",{per_page:"@{limit|50}"}),"me/following":r("flickr.contacts.getList",{per_page:"@{limit|50}"}),"me/followers":r("flickr.contacts.getList",{per_page:"@{limit|50}"}),"me/albums":r("flickr.photosets.getList",{per_page:"@{limit|50}"}),"me/photos":r("flickr.people.getPhotos",{per_page:"@{limit|50}"})},wrap:{me:function(e){if(s(e),e=c(e,"person"),e.id){if(e.realname){e.name=e.realname._content;var t=e.name.split(" ");e.first_name=t[0],e.last_name=t[1]}e.thumbnail=o(e,"l"),e.picture=o(e,"l")}return e},"me/friends":l,"me/followers":l,"me/following":l,"me/albums":function(e){if(s(e),e=c(e,"photosets"),u(e),e.photoset){e.data=e.photoset,delete e.photoset;for(var n=0;n<e.data.length;n++){var r=e.data[n];r.name=r.title._content,r.photos="http://api.flickr.com/services/rest"+t("flickr.photosets.getPhotos",{photoset_id:r.id},!0)}}return e},"me/photos":function(e){return s(e),a(e)},"default":function(e){return s(e),a(e)}},xhr:!1,jsonp:function(e,t){"get"==e.method.toLowerCase()&&(delete t.callback,t.jsoncallback=e.callbackID)}}})}(hello);
 !function(e){function t(e){e.meta&&400===e.meta.code&&(e.error={code:"access_denied",message:e.meta.errorDetail})}function n(e){e&&e.id&&(e.thumbnail=e.photo.prefix+"100x100"+e.photo.suffix,e.name=e.firstName+" "+e.lastName,e.first_name=e.firstName,e.last_name=e.lastName,e.contact&&e.contact.email&&(e.email=e.contact.email))}e.init({foursquare:{name:"FourSquare",oauth:{version:2,auth:"https://foursquare.com/oauth2/authenticate"},querystring:function(e){var t=e.access_token;delete e.access_token,e.oauth_token=t,e.v=20121125},base:"https://api.foursquare.com/v2/",get:{me:"users/self","me/friends":"users/self/friends","me/followers":"users/self/friends","me/following":"users/self/friends"},wrap:{me:function(e){return t(e),e&&e.response&&(e=e.response.user,n(e)),e},"default":function(e){if(t(e),e&&"response"in e&&"friends"in e.response&&"items"in e.response.friends){e.data=e.response.friends.items,delete e.response;for(var r=0;r<e.data.length;r++)n(e.data[r])}return e}}}})}(hello);
 !function(e){function t(e,t){var n=t?t.statusCode:e&&"meta"in e&&"status"in e.meta&&e.meta.status;(401===n||403===n)&&(e.error={code:"access_denied",message:e.message||(e.data?e.data.message:"Could not get response")},delete e.message)}function n(e){e.id&&(e.thumbnail=e.picture=e.avatar_url,e.name=e.login)}function r(e,t){if(e.data&&e.data.length&&t&&t.Link){var n=t.Link.match(/&page=([0-9]+)/);n&&(e.paging={next:"?page="+n[1]})}}e.init({github:{name:"GitHub",oauth:{version:2,auth:"https://github.com/login/oauth/authorize",grant:"https://github.com/login/oauth/access_token"},base:"https://api.github.com/",get:{me:"user","me/friends":"user/following?per_page=@{limit|100}","me/following":"user/following?per_page=@{limit|100}","me/followers":"user/followers?per_page=@{limit|100}"},wrap:{me:function(e,r){return t(e,r),n(e),e},"default":function(e,o,i){if(t(e,o),"[object Array]"===Object.prototype.toString.call(e)){e={data:e},r(e,o,i);for(var s=0;s<e.data.length;s++)n(e.data[s])}return e}}}})}(hello);
-!function(e,t){"use strict";function n(e){return parseInt(e,10)}function r(e){e.error||(e.name||(e.name=e.title||e.message),e.picture||(e.picture=e.thumbnailLink),e.thumbnail||(e.thumbnail=e.thumbnailLink),"application/vnd.google-apps.folder"===e.mimeType&&(e.type="folder",e.files="https://www.googleapis.com/drive/v2/files?q=%22"+e.id+"%22+in+parents"))}function o(e){a(e);var t=function(e){var t,n=e.media$group.media$content.length?e.media$group.media$content[0]:{},r=0,o={id:e.id.$t,name:e.title.$t,description:e.summary.$t,updated_time:e.updated.$t,created_time:e.published.$t,picture:n?n.url:null,thumbnail:n?n.url:null,width:n.width,height:n.height};if("link"in e)for(r=0;r<e.link.length;r++){var i=e.link[r];if(i.rel.match(/\#feed$/)){o.upload_location=o.files=o.photos=i.href;break}}if("category"in e&&e.category.length)for(t=e.category,r=0;r<t.length;r++)t[r].scheme&&t[r].scheme.match(/\#kind$/)&&(o.type=t[r].term.replace(/^.*?\#/,""));if("media$thumbnail"in e.media$group&&e.media$group.media$thumbnail.length){for(t=e.media$group.media$thumbnail,o.thumbnail=e.media$group.media$thumbnail[0].url,o.images=[],r=0;r<t.length;r++)o.images.push({source:t[r].url,width:t[r].width,height:t[r].height});t=e.media$group.media$content.length?e.media$group.media$content[0]:null,t&&o.images.push({source:t.url,width:t.width,height:t.height})}return o},n=[];if("feed"in e&&"entry"in e.feed){for(o=0;o<e.feed.entry.length;o++)n.push(t(e.feed.entry[o]));e.data=n,delete e.feed}else{if("entry"in e)return t(e.entry);if("items"in e){for(var o=0;o<e.items.length;o++)r(e.items[o]);e.data=e.items,delete e.items}else r(e)}return e}function i(t){a(t);var n=[];if("feed"in t&&"entry"in t.feed){for(var r=e.getAuthResponse("google").access_token,o=0;o<t.feed.entry.length;o++){var i=t.feed.entry[o],s=i.link&&i.link.length>0?i.link[0].href+"?access_token="+r:null;n.push({id:i.id.$t,name:i.title.$t,email:i.gd$email&&i.gd$email.length>0?i.gd$email[0].address:null,updated_time:i.updated.$t,picture:s,thumbnail:s})}t.data=n,delete t.feed}return t}function a(e){if("feed"in e&&e.feed.openSearch$itemsPerPage){var t=n(e.feed.openSearch$itemsPerPage.$t),r=n(e.feed.openSearch$startIndex.$t),o=n(e.feed.openSearch$totalResults.$t);o>r+t&&(e.paging={next:"?start="+(r+t)})}else"nextPageToken"in e&&(e.paging={next:"?pageToken="+e.nextPageToken})}function s(){function e(e){var t=new FileReader;t.onload=function(t){n(btoa(t.target.result),e.type+a+"Content-Transfer-Encoding: base64")},t.readAsBinaryString(e)}function n(e,t){r.push(a+"Content-Type: "+t+a+a+e),i--,l()}var r=[],o=(1e10*Math.random()).toString(32),i=0,a="\r\n",s=a+"--"+o,l=function(){},c=/^data\:([^;,]+(\;charset=[^;,]+)?)(\;base64)?,/i;this.append=function(r,o){"string"!=typeof r&&"length"in Object(r)||(r=[r]);for(var s=0;s<r.length;s++){i++;var l=r[s];if(l instanceof t.File||l instanceof t.Blob)e(l);else if("string"==typeof l&&l.match(c)){var u=l.match(c);n(l.replace(c,""),u[1]+a+"Content-Transfer-Encoding: base64")}else n(l,o)}},this.onready=function(e){l=function(){0===i&&(r.unshift(""),r.push("--"),e(r.join(s),o),r=[])},l()}}function l(e,n,r,o,i){var a="https://content.googleapis.com";d||(h=String(parseInt(1e8*Math.random(),10)),d=f.append("iframe",{src:a+"/static/proxy.html?jsh=m%3B%2F_%2Fscs%2Fapps-static%2F_%2Fjs%2Fk%3Doz.gapi.en.mMZgig4ibk0.O%2Fm%3D__features__%2Fam%3DEQ%2Frt%3Dj%2Fd%3D1%2Frs%3DAItRSTNZBJcXGialq7mfSUkqsE3kvYwkpQ#parent="+t.location.origin+"&rpctoken="+h,style:{position:"absolute",left:"-1000px",bottom:0,height:"1px",width:"1px"}},"body"),u(t,"message",function(e){if(e.origin===a){var t;try{t=JSON.parse(e.data)}catch(n){return}if(t&&t.s&&t.s==="ready:"+h){m=!0,g=0;for(var r=0;r<v.length;r++)v[r]()}}}));var s=function(){var s=t.navigator,l=++g,c=f.param(n.match(/\?.+/)[0]),m=c.access_token;delete c.access_token;var v=JSON.stringify({s:"makeHttpRequests",f:"..",c:l,a:[[{key:"gapiRequest",params:{url:n.replace(/(^https?\:\/\/[^\/]+|\?.+$)/,""),httpMethod:e.toUpperCase(),body:o,headers:{Authorization:":Bearer "+m,"Content-Type":r["content-type"],"X-Origin":t.location.origin,"X-ClientDetails":"appVersion="+s.appVersion+"&platform="+s.platform+"&userAgent="+s.userAgent},urlParams:c,clientName:"google-api-javascript-client",clientVersion:"1.1.0-beta"}}]],t:h,l:!1,g:!0,r:".."});u(t,"message",function w(e){if(e.origin===a)try{var n=JSON.parse(e.data);n.t===h&&n.a[0]===l&&(p(t,"message",w),i(JSON.parse(JSON.parse(n.a[1]).gapiRequest.data.body)))}catch(r){i({error:{code:"request_error",message:"Failed to post to Google"}})}}),d.contentWindow.postMessage(v,"*")};m?s():v.push(s)}function c(e,n){var r={};e.data&&e.data instanceof t.HTMLInputElement&&(e.data={file:e.data}),!e.data.name&&Object(Object(e.data.file).files).length&&"post"===e.method&&(e.data.name=e.data.file.files[0].name),"post"===e.method?e.data={title:e.data.name,parents:[{id:e.data.parent||"root"}],file:e.data.file}:(r=e.data,e.data={},r.parent&&(e.data.parents=[{id:e.data.parent||"root"}]),r.file&&(e.data.file=r.file),r.name&&(e.data.title=r.name)),n("upload/drive/v2/files"+(r.id?"/"+r.id:"")+"?uploadType=multipart")}var u,p,f=e.utils;document.removeEventListener?(u=function(e,t,n){e.addEventListener(t,n)},p=function(e,t,n){e.removeEventListener(t,n)}):document.detachEvent&&(p=function(e,t,n){e.detachEvent("on"+t,n)},u=function(e,t,n){e.attachEvent("on"+t,n)});var d,m,h,g,v=[],w="https://www.google.com/m8/feeds/contacts/default/full?alt=json&max-results=@{limit|1000}&start-index=@{start|1}";e.init({google:{name:"Google Plus",login:function(e){"none"===e.qs.display&&(e.qs.display="")},oauth:{version:2,auth:"https://accounts.google.com/o/oauth2/auth"},scope:{basic:"https://www.googleapis.com/auth/plus.me https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile",email:"",birthday:"",events:"",photos:"https://picasaweb.google.com/data/",videos:"http://gdata.youtube.com",friends:"https://www.google.com/m8/feeds",files:"https://www.googleapis.com/auth/drive.readonly",publish:"",publish_files:"https://www.googleapis.com/auth/drive",create_event:"",offline_access:""},scope_delim:" ",base:"https://www.googleapis.com/",get:{me:"oauth2/v1/userinfo?alt=json","me/friends":w,"me/following":w,"me/followers":w,"me/share":"plus/v1/people/me/activities/public?maxResults=@{limit|100}","me/feed":"plus/v1/people/me/activities/public?maxResults=@{limit|100}","me/albums":"https://picasaweb.google.com/data/feed/api/user/default?alt=json&max-results=@{limit|100}&start-index=@{start|1}","me/album":function(e,t){var n=e.data.id;delete e.data.id,t(n.replace("/entry/","/feed/"))},"me/photos":"https://picasaweb.google.com/data/feed/api/user/default?alt=json&kind=photo&max-results=@{limit|100}&start-index=@{start|1}","me/files":"drive/v2/files?q=%22@{parent|root}%22+in+parents+and+trashed=false&maxResults=@{limit|100}","me/folders":"drive/v2/files?q=%22@{id|root}%22+in+parents+and+mimeType+=+%22application/vnd.google-apps.folder%22+and+trashed=false&maxResults=@{limit|100}","me/folder":"drive/v2/files?q=%22@{id|root}%22+in+parents+and+trashed=false&maxResults=@{limit|100}"},post:{"me/files":c,"me/folders":function(e,t){e.data={title:e.data.name,parents:[{id:e.data.parent||"root"}],mimeType:"application/vnd.google-apps.folder"},t("drive/v2/files")}},put:{"me/files":c},del:{"me/files":"drive/v2/files/@{id}","me/folder":"drive/v2/files/@{id}"},wrap:{me:function(e){return e.id&&(e.last_name=e.family_name||(e.name?e.name.familyName:null),e.first_name=e.given_name||(e.name?e.name.givenName:null),e.picture=e.picture||(e.image?e.image.url:null),e.thumbnail=e.picture,e.name=e.displayName||e.name),e},"me/friends":i,"me/followers":i,"me/following":i,"me/share":function(e){return a(e),e.data=e.items,delete e.items,e},"me/feed":function(e){return a(e),e.data=e.items,delete e.items,e},"me/albums":o,"me/photos":o,"default":o},xhr:function(e){if("post"===e.method||"put"===e.method){if(e.data&&f.hasBinary(e.data)||e.data.file)return e.cors_support=e.cors_support||!0,!1;e.data=JSON.stringify(e.data),e.headers={"content-type":"application/json"}}return!0},api:function(e,t,n,r){if("get"!==t.method){"file"in t.data&&f.domInstance("input",t.data.file)&&!("files"in t.data.file)&&r({error:{code:"request_invalid",message:"Sorry, can't upload your files to Google Drive in this browser"}});var o;if("file"in t.data&&(o=t.data.file,delete t.data.file,"object"==typeof o&&"files"in o&&(o=o.files),!o||!o.length))return r({error:{code:"request_invalid",message:"There were no files attached with this request to upload"}}),void 0;var i=new s;return i.append(JSON.stringify(t.data),"application/json"),o&&i.append(o),i.onready(function(o,i){t.cors_support?f.xhr(t.method,f.qs(e,n),{"content-type":'multipart/related; boundary="'+i+'"'},o,r):l(t.method,f.qs(e,n),{"content-type":'multipart/related; boundary="'+i+'"'},o,r)}),!0}}}})}(hello,window);
+!function(e,t){"use strict";function n(e){return parseInt(e,10)}function r(e){e.error||(e.name||(e.name=e.title||e.message),e.picture||(e.picture=e.thumbnailLink),e.thumbnail||(e.thumbnail=e.thumbnailLink),"application/vnd.google-apps.folder"===e.mimeType&&(e.type="folder",e.files="https://www.googleapis.com/drive/v2/files?q=%22"+e.id+"%22+in+parents"))}function o(e){s(e);var t=function(e){var t,n=e.media$group.media$content.length?e.media$group.media$content[0]:{},r=0,o={id:e.id.$t,name:e.title.$t,description:e.summary.$t,updated_time:e.updated.$t,created_time:e.published.$t,picture:n?n.url:null,thumbnail:n?n.url:null,width:n.width,height:n.height};if("link"in e)for(r=0;r<e.link.length;r++){var i=e.link[r];if(i.rel.match(/\#feed$/)){o.upload_location=o.files=o.photos=i.href;break}}if("category"in e&&e.category.length)for(t=e.category,r=0;r<t.length;r++)t[r].scheme&&t[r].scheme.match(/\#kind$/)&&(o.type=t[r].term.replace(/^.*?\#/,""));if("media$thumbnail"in e.media$group&&e.media$group.media$thumbnail.length){for(t=e.media$group.media$thumbnail,o.thumbnail=e.media$group.media$thumbnail[0].url,o.images=[],r=0;r<t.length;r++)o.images.push({source:t[r].url,width:t[r].width,height:t[r].height});t=e.media$group.media$content.length?e.media$group.media$content[0]:null,t&&o.images.push({source:t.url,width:t.width,height:t.height})}return o},n=[];if("feed"in e&&"entry"in e.feed){for(o=0;o<e.feed.entry.length;o++)n.push(t(e.feed.entry[o]));e.data=n,delete e.feed}else{if("entry"in e)return t(e.entry);if("items"in e){for(var o=0;o<e.items.length;o++)r(e.items[o]);e.data=e.items,delete e.items}else r(e)}return e}function i(e){e.name=e.displayName||e.name,e.picture=e.picture||(e.image?e.image.url:null),e.thumbnail=e.picture}function a(t){s(t);var n=[];if("feed"in t&&"entry"in t.feed){for(var r=e.getAuthResponse("google").access_token,o=0;o<t.feed.entry.length;o++){var i=t.feed.entry[o],a=i.link&&i.link.length>0?i.link[0].href+"?access_token="+r:null;n.push({id:i.id.$t,name:i.title.$t,email:i.gd$email&&i.gd$email.length>0?i.gd$email[0].address:null,updated_time:i.updated.$t,picture:a,thumbnail:a})}t.data=n,delete t.feed}return t}function s(e){if("feed"in e&&e.feed.openSearch$itemsPerPage){var t=n(e.feed.openSearch$itemsPerPage.$t),r=n(e.feed.openSearch$startIndex.$t),o=n(e.feed.openSearch$totalResults.$t);o>r+t&&(e.paging={next:"?start="+(r+t)})}else"nextPageToken"in e&&(e.paging={next:"?pageToken="+e.nextPageToken})}function l(){function e(e){var t=new FileReader;t.onload=function(t){n(btoa(t.target.result),e.type+a+"Content-Transfer-Encoding: base64")},t.readAsBinaryString(e)}function n(e,t){r.push(a+"Content-Type: "+t+a+a+e),i--,l()}var r=[],o=(1e10*Math.random()).toString(32),i=0,a="\r\n",s=a+"--"+o,l=function(){},c=/^data\:([^;,]+(\;charset=[^;,]+)?)(\;base64)?,/i;this.append=function(r,o){"string"!=typeof r&&"length"in Object(r)||(r=[r]);for(var s=0;s<r.length;s++){i++;var l=r[s];if(l instanceof t.File||l instanceof t.Blob)e(l);else if("string"==typeof l&&l.match(c)){var u=l.match(c);n(l.replace(c,""),u[1]+a+"Content-Transfer-Encoding: base64")}else n(l,o)}},this.onready=function(e){l=function(){0===i&&(r.unshift(""),r.push("--"),e(r.join(s),o),r=[])},l()}}function c(e,n,r,o,i){var a="https://content.googleapis.com";m||(g=String(parseInt(1e8*Math.random(),10)),m=d.append("iframe",{src:a+"/static/proxy.html?jsh=m%3B%2F_%2Fscs%2Fapps-static%2F_%2Fjs%2Fk%3Doz.gapi.en.mMZgig4ibk0.O%2Fm%3D__features__%2Fam%3DEQ%2Frt%3Dj%2Fd%3D1%2Frs%3DAItRSTNZBJcXGialq7mfSUkqsE3kvYwkpQ#parent="+t.location.origin+"&rpctoken="+g,style:{position:"absolute",left:"-1000px",bottom:0,height:"1px",width:"1px"}},"body"),p(t,"message",function(e){if(e.origin===a){var t;try{t=JSON.parse(e.data)}catch(n){return}if(t&&t.s&&t.s==="ready:"+g){h=!0,v=0;for(var r=0;r<w.length;r++)w[r]()}}}));var s=function(){var s=t.navigator,l=++v,c=d.param(n.match(/\?.+/)[0]),u=c.access_token;delete c.access_token;var h=JSON.stringify({s:"makeHttpRequests",f:"..",c:l,a:[[{key:"gapiRequest",params:{url:n.replace(/(^https?\:\/\/[^\/]+|\?.+$)/,""),httpMethod:e.toUpperCase(),body:o,headers:{Authorization:":Bearer "+u,"Content-Type":r["content-type"],"X-Origin":t.location.origin,"X-ClientDetails":"appVersion="+s.appVersion+"&platform="+s.platform+"&userAgent="+s.userAgent},urlParams:c,clientName:"google-api-javascript-client",clientVersion:"1.1.0-beta"}}]],t:g,l:!1,g:!0,r:".."});p(t,"message",function w(e){if(e.origin===a)try{var n=JSON.parse(e.data);n.t===g&&n.a[0]===l&&(f(t,"message",w),i(JSON.parse(JSON.parse(n.a[1]).gapiRequest.data.body)))}catch(r){i({error:{code:"request_error",message:"Failed to post to Google"}})}}),m.contentWindow.postMessage(h,"*")};h?s():w.push(s)}function u(e,n){var r={};e.data&&e.data instanceof t.HTMLInputElement&&(e.data={file:e.data}),!e.data.name&&Object(Object(e.data.file).files).length&&"post"===e.method&&(e.data.name=e.data.file.files[0].name),"post"===e.method?e.data={title:e.data.name,parents:[{id:e.data.parent||"root"}],file:e.data.file}:(r=e.data,e.data={},r.parent&&(e.data.parents=[{id:e.data.parent||"root"}]),r.file&&(e.data.file=r.file),r.name&&(e.data.title=r.name)),n("upload/drive/v2/files"+(r.id?"/"+r.id:"")+"?uploadType=multipart")}var p,f,d=e.utils;document.removeEventListener?(p=function(e,t,n){e.addEventListener(t,n)},f=function(e,t,n){e.removeEventListener(t,n)}):document.detachEvent&&(f=function(e,t,n){e.detachEvent("on"+t,n)},p=function(e,t,n){e.attachEvent("on"+t,n)});var m,h,g,v,w=[],y="https://www.google.com/m8/feeds/contacts/default/full?alt=json&max-results=@{limit|1000}&start-index=@{start|1}";e.init({google:{name:"Google Plus",login:function(e){"none"===e.qs.display&&(e.qs.display="")},oauth:{version:2,auth:"https://accounts.google.com/o/oauth2/auth"},scope:{basic:"https://www.googleapis.com/auth/plus.me https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile",email:"",birthday:"",events:"",photos:"https://picasaweb.google.com/data/",videos:"http://gdata.youtube.com",friends:"https://www.google.com/m8/feeds, https://www.googleapis.com/auth/plus.login",files:"https://www.googleapis.com/auth/drive.readonly",publish:"",publish_files:"https://www.googleapis.com/auth/drive",create_event:"",offline_access:""},scope_delim:" ",base:"https://www.googleapis.com/",get:{me:"oauth2/v1/userinfo?alt=json","me/friends":"plus/v1/people/me/people/visible?maxResults=@{limit|100}","me/following":y,"me/followers":y,"me/contacts":y,"me/share":"plus/v1/people/me/activities/public?maxResults=@{limit|100}","me/feed":"plus/v1/people/me/activities/public?maxResults=@{limit|100}","me/albums":"https://picasaweb.google.com/data/feed/api/user/default?alt=json&max-results=@{limit|100}&start-index=@{start|1}","me/album":function(e,t){var n=e.data.id;delete e.data.id,t(n.replace("/entry/","/feed/"))},"me/photos":"https://picasaweb.google.com/data/feed/api/user/default?alt=json&kind=photo&max-results=@{limit|100}&start-index=@{start|1}","me/files":"drive/v2/files?q=%22@{parent|root}%22+in+parents+and+trashed=false&maxResults=@{limit|100}","me/folders":"drive/v2/files?q=%22@{id|root}%22+in+parents+and+mimeType+=+%22application/vnd.google-apps.folder%22+and+trashed=false&maxResults=@{limit|100}","me/folder":"drive/v2/files?q=%22@{id|root}%22+in+parents+and+trashed=false&maxResults=@{limit|100}"},post:{"me/files":u,"me/folders":function(e,t){e.data={title:e.data.name,parents:[{id:e.data.parent||"root"}],mimeType:"application/vnd.google-apps.folder"},t("drive/v2/files")}},put:{"me/files":u},del:{"me/files":"drive/v2/files/@{id}","me/folder":"drive/v2/files/@{id}"},wrap:{me:function(e){return e.id&&(e.last_name=e.family_name||(e.name?e.name.familyName:null),e.first_name=e.given_name||(e.name?e.name.givenName:null),i(e)),e},"me/friends":function(e){if(e.items){s(e),e.data=e.items,delete e.items;for(var t=0;t<e.data.length;t++)i(e.data[t])}return e},"me/contacts":a,"me/followers":a,"me/following":a,"me/share":function(e){return s(e),e.data=e.items,delete e.items,e},"me/feed":function(e){return s(e),e.data=e.items,delete e.items,e},"me/albums":o,"me/photos":o,"default":o},xhr:function(e){if("post"===e.method||"put"===e.method){if(e.data&&d.hasBinary(e.data)||e.data.file)return e.cors_support=e.cors_support||!0,!1;e.data=JSON.stringify(e.data),e.headers={"content-type":"application/json"}}return!0},api:function(e,t,n,r){if("get"!==t.method){"file"in t.data&&d.domInstance("input",t.data.file)&&!("files"in t.data.file)&&r({error:{code:"request_invalid",message:"Sorry, can't upload your files to Google Drive in this browser"}});var o;if("file"in t.data&&(o=t.data.file,delete t.data.file,"object"==typeof o&&"files"in o&&(o=o.files),!o||!o.length))return r({error:{code:"request_invalid",message:"There were no files attached with this request to upload"}}),void 0;var i=new l;return i.append(JSON.stringify(t.data),"application/json"),o&&i.append(o),i.onready(function(o,i){t.cors_support?d.xhr(t.method,d.qs(e,n),{"content-type":'multipart/related; boundary="'+i+'"'},o,r):c(t.method,d.qs(e,n),{"content-type":'multipart/related; boundary="'+i+'"'},o,r)}),!0}}}})}(hello,window);
 !function(e){function t(e){e&&"meta"in e&&"error_type"in e.meta&&(e.error={code:e.meta.error_type,message:e.meta.error_message})}function n(e){if(o(e),e&&"data"in e)for(var t=0;t<e.data.length;t++)r(e.data[t]);return e}function r(e){e.id&&(e.thumbnail=e.profile_picture,e.name=e.full_name||e.username)}function o(e){"pagination"in e&&(e.paging={next:e.pagination.next_url},delete e.pagination)}e.init({instagram:{name:"Instagram",login:function(e){e.qs.display=""},oauth:{version:2,auth:"https://instagram.com/oauth/authorize/"},scope:{basic:"basic",friends:"relationships"},scope_delim:" ",base:"https://api.instagram.com/v1/",get:{me:"users/self","me/feed":"users/self/feed?count=@{limit|100}","me/photos":"users/self/media/recent?min_id=0&count=@{limit|100}","me/friends":"users/self/follows?count=@{limit|100}","me/following":"users/self/follows?count=@{limit|100}","me/followers":"users/self/followed-by?count=@{limit|100}"},wrap:{me:function(e){return t(e),"data"in e&&(e.id=e.data.id,e.thumbnail=e.data.profile_picture,e.name=e.data.full_name||e.data.username),e},"me/friends":n,"me/following":n,"me/followers":n,"me/photos":function(e){if(t(e),o(e),"data"in e)for(var n=0;n<e.data.length;n++){var r=e.data[n];"image"!==r.type&&(delete e.data[n],n--),r.thumbnail=r.images.thumbnail.url,r.picture=r.images.standard_resolution.url,r.name=r.caption?r.caption.text:null}return e},"default":function(e){return o(e),e}},xhr:!1}})}(hello);
 !function(e){function t(e){e&&"errorCode"in e&&(e.error={code:e.status,message:e.message})}function n(e){e.error||(e.first_name=e.firstName,e.last_name=e.lastName,e.name=e.formattedName||e.first_name+" "+e.last_name,e.thumbnail=e.pictureUrl)}function o(e){if(t(e),r(e),e.values){e.data=e.values;for(var o=0;o<e.data.length;o++)n(e.data[o]);delete e.values}return e}function r(e){"_count"in e&&"_start"in e&&e._count+e._start<e._total&&(e.paging={next:"?start="+(e._start+e._count)+"&count="+e._count})}e.init({linkedin:{login:function(e){e.qs.response_type="code"},oauth:{version:2,auth:"https://www.linkedin.com/uas/oauth2/authorization",grant:"https://www.linkedin.com/uas/oauth2/accessToken"},scope:{basic:"r_fullprofile",email:"r_emailaddress",friends:"r_network",publish:"rw_nus"},scope_delim:" ",querystring:function(e){e.oauth2_access_token=e.access_token,delete e.access_token},base:"https://api.linkedin.com/v1/",get:{me:"people/~:(picture-url,first-name,last-name,id,formatted-name)","me/friends":"people/~/connections?count=@{limit|500}","me/followers":"people/~/connections?count=@{limit|500}","me/following":"people/~/connections?count=@{limit|500}","me/share":"people/~/network/updates?count=@{limit|250}"},post:{},wrap:{me:function(e){return t(e),n(e),e},"me/friends":o,"me/following":o,"me/followers":o,"me/share":function(e){if(t(e),r(e),e.values){e.data=e.values,delete e.values;for(var o=0;o<e.data.length;o++){var i=e.data[o];n(i),i.message=i.headline}}return e},"default":function(e){t(e),r(e)}},jsonp:function(e,t){t.format="jsonp","get"===e.method&&(t["error-callback"]="?")},xhr:!1}})}(hello);
 !function(e){function t(e){e.id&&(e.picture=e.avatar_url,e.thumbnail=e.avatar_url,e.name=e.username||e.full_name)}function n(e){"next_href"in e&&(e.paging={next:e.next_href})}e.init({soundcloud:{name:"SoundCloud",oauth:{version:2,auth:"https://soundcloud.com/connect"},autorefresh:!1,querystring:function(e){var t=e.access_token;delete e.access_token,e.oauth_token=t,e["_status_code_map[302]"]=200},base:"https://api.soundcloud.com/",get:{me:"me.json","me/friends":"me/followings.json","me/followers":"me/followers.json","me/following":"me/followings.json","default":function(e,t){t(e.path+".json")}},wrap:{me:function(e){return t(e),e},"default":function(e){if(e instanceof Array){e={data:e};for(var o=0;o<e.data.length;o++)t(e.data[o])}return n(e),e}}}})}(hello);
 !function(e){function t(e){if(e.id){if(e.name){var t=e.name.split(" ");e.first_name=t[0],e.last_name=t[1]}e.thumbnail=e.profile_image_url}}function n(e){if(o(e),r(e),e.users){e.data=e.users;for(var n=0;n<e.data.length;n++)t(e.data[n]);delete e.users}return e}function o(e){if(e.errors){var t=e.errors[0];e.error={code:"request_failed",message:t.message}}}function r(e){"next_cursor_str"in e&&(e.paging={next:"?cursor="+e.next_cursor_str})}e.init({twitter:{oauth:{version:"1.0a",auth:"https://twitter.com/oauth/authorize",request:"https://twitter.com/oauth/request_token",token:"https://twitter.com/oauth/access_token"},autorefresh:!1,base:"https://api.twitter.com/1.1/",get:{me:"account/verify_credentials.json","me/friends":"friends/list.json?count=@{limit|200}","me/following":"friends/list.json?count=@{limit|200}","me/followers":"followers/list.json?count=@{limit|200}","me/share":"statuses/user_timeline.json?count=@{limit|200}"},post:{"me/share":function(e,t){var n=e.data;e.data=null,t("statuses/update.json?include_entities=1&status="+n.message)}},wrap:{me:function(e){return o(e),t(e),e},"me/friends":n,"me/followers":n,"me/following":n,"me/share":function(e){return o(e),r(e),!e.error&&"length"in e?{data:e}:e},"default":function(e){return r(e),e}},xhr:function(e){return"get"!==e.method}}})}(hello);
-!function(e){function t(t){if(t.id){var n=e.getAuthResponse("windows").access_token;t.email=t.emails?t.emails.preferred:null,t.thumbnail=t.picture="https://apis.live.net/v5.0/"+t.id+"/picture?access_token="+n}}function n(e){if("data"in e)for(var n=0;n<e.data.length;n++)t(e.data[n]);return e}function o(e){for(var t=/^data\:([^;,]+(\;charset=[^;,]+)?)(\;base64)?,/i,n=e.match(t),o=atob(e.replace(t,"")),i=[],r=0;r<o.length;r++)i.push(o.charCodeAt(r));return new Blob([new Uint8Array(i)],{type:n[1]})}e.init({windows:{name:"Windows live",oauth:{version:2,auth:"https://login.live.com/oauth20_authorize.srf"},scope:{basic:"wl.signin,wl.basic",email:"wl.emails",birthday:"wl.birthday",events:"wl.calendars",photos:"wl.photos",videos:"wl.photos",friends:"wl.contacts_emails",files:"wl.skydrive",publish:"wl.share",publish_files:"wl.skydrive_update",create_event:"wl.calendars_update,wl.events_create",offline_access:"wl.offline_access"},base:"https://apis.live.net/v5.0/",get:{me:"me","me/friends":"me/friends","me/following":"me/contacts","me/followers":"me/friends","me/albums":"me/albums","me/album":"@{id}/files","me/photo":"@{id}","me/files":"@{parent|me/skydrive}/files","me/folders":"@{id|me/skydrive}/files","me/folder":"@{id|me/skydrive}/files"},post:{"me/albums":"me/albums","me/album":"@{id}/files","me/folders":"@{id|me/skydrive/}","me/files":"@{parent|me/skydrive/}/files"},del:{"me/album":"@{id}","me/photo":"@{id}","me/folder":"@{id}","me/files":"@{id}"},wrap:{me:function(e){return t(e),e},"me/friends":n,"me/followers":n,"me/following":n,"me/albums":function(e){if("data"in e)for(var t=0;t<e.data.length;t++){var n=e.data[t];n.photos=n.files="https://apis.live.net/v5.0/"+n.id+"/photos"}return e},"default":function(e){if("data"in e)for(var t=0;t<e.data.length;t++){var n=e.data[t];n.picture&&(n.thumbnail=n.picture)}return e}},xhr:function(t){return"get"===t.method||"delete"===t.method||e.utils.hasBinary(t.data)||("string"==typeof t.data.file?t.data.file=o(t.data.file):(t.data=JSON.stringify(t.data),t.headers={"Content-Type":"application/json"})),!0},jsonp:function(t){"get"===t.method.toLowerCase()||e.utils.hasBinary(t.data)||(t.data.method=t.method.toLowerCase(),t.method="get")}}})}(hello);
-!function(e){function t(e){e&&"meta"in e&&"error_type"in e.meta&&(e.error={code:e.meta.error_type,message:e.meta.error_message})}function n(e){t(e),o(e);var n,r;if(e.query&&e.query.results&&e.query.results.contact){e.data=e.query.results.contact,delete e.query,e.data instanceof Array||(e.data=[e.data]);for(var i=0;i<e.data.length;i++){n=e.data[i],n.id=null;for(var a=0;a<n.fields.length;a++)r=n.fields[a],"email"===r.type&&(n.email=r.value),"name"===r.type&&(n.first_name=r.value.givenName,n.last_name=r.value.familyName,n.name=r.value.givenName+" "+r.value.familyName),"yahooid"===r.type&&(n.id=r.value)}}return e}function o(e){e.query&&e.query.count&&(e.paging={next:"?start="+e.query.count})}var r=function(e){return"https://query.yahooapis.com/v1/yql?q="+(e+" limit @{limit|100} offset @{start|0}").replace(/\s/g,"%20")+"&format=json"};e.init({yahoo:{oauth:{version:"1.0a",auth:"https://api.login.yahoo.com/oauth/v2/request_auth",request:"https://api.login.yahoo.com/oauth/v2/get_request_token",token:"https://api.login.yahoo.com/oauth/v2/get_token"},autorefresh:!1,base:"https://social.yahooapis.com/v1/",get:{me:r("select * from social.profile(0) where guid=me"),"me/friends":r("select * from social.contacts(0) where guid=me"),"me/following":r("select * from social.contacts(0) where guid=me")},wrap:{me:function(e){return t(e),e.query&&e.query.results&&e.query.results.profile&&(e=e.query.results.profile,e.id=e.guid,e.name=e.givenName+" "+e.familyName,e.last_name=e.familyName,e.first_name=e.givenName,e.email=e.emails?e.emails.handle:null,e.thumbnail=e.image?e.image.imageUrl:null),e},"me/friends":n,"me/following":n,"default":function(e){return o(e),e}},xhr:!1}})}(hello);
\ No newline at end of file
+!function(e){function t(t){if(t.id){var n=e.getAuthResponse("windows").access_token;if(t.emails&&(t.email=t.emails.preferred),t.is_friend!==!1){var o=t.user_id||t.id;t.thumbnail=t.picture="https://apis.live.net/v5.0/"+o+"/picture?access_token="+n}}}function n(e){if("data"in e)for(var n=0;n<e.data.length;n++)t(e.data[n]);return e}function o(e){for(var t=/^data\:([^;,]+(\;charset=[^;,]+)?)(\;base64)?,/i,n=e.match(t),o=atob(e.replace(t,"")),i=[],r=0;r<o.length;r++)i.push(o.charCodeAt(r));return new Blob([new Uint8Array(i)],{type:n[1]})}e.init({windows:{name:"Windows live",oauth:{version:2,auth:"https://login.live.com/oauth20_authorize.srf"},scope:{basic:"wl.signin,wl.basic",email:"wl.emails",birthday:"wl.birthday",events:"wl.calendars",photos:"wl.photos",videos:"wl.photos",friends:"wl.contacts_emails",files:"wl.skydrive",publish:"wl.share",publish_files:"wl.skydrive_update",create_event:"wl.calendars_update,wl.events_create",offline_access:"wl.offline_access"},base:"https://apis.live.net/v5.0/",get:{me:"me","me/friends":"me/friends","me/following":"me/contacts","me/followers":"me/friends","me/contacts":"me/contacts","me/albums":"me/albums","me/album":"@{id}/files","me/photo":"@{id}","me/files":"@{parent|me/skydrive}/files","me/folders":"@{id|me/skydrive}/files","me/folder":"@{id|me/skydrive}/files"},post:{"me/albums":"me/albums","me/album":"@{id}/files","me/folders":"@{id|me/skydrive/}","me/files":"@{parent|me/skydrive/}/files"},del:{"me/album":"@{id}","me/photo":"@{id}","me/folder":"@{id}","me/files":"@{id}"},wrap:{me:function(e){return t(e),e},"me/friends":n,"me/contacts":n,"me/followers":n,"me/following":n,"me/albums":function(e){if("data"in e)for(var t=0;t<e.data.length;t++){var n=e.data[t];n.photos=n.files="https://apis.live.net/v5.0/"+n.id+"/photos"}return e},"default":function(e){if("data"in e)for(var t=0;t<e.data.length;t++){var n=e.data[t];n.picture&&(n.thumbnail=n.picture)}return e}},xhr:function(t){return"get"===t.method||"delete"===t.method||e.utils.hasBinary(t.data)||("string"==typeof t.data.file?t.data.file=o(t.data.file):(t.data=JSON.stringify(t.data),t.headers={"Content-Type":"application/json"})),!0},jsonp:function(t){"get"===t.method.toLowerCase()||e.utils.hasBinary(t.data)||(t.data.method=t.method.toLowerCase(),t.method="get")}}})}(hello);
+!function(e){function t(e){e&&"meta"in e&&"error_type"in e.meta&&(e.error={code:e.meta.error_type,message:e.meta.error_message})}function n(e){t(e),o(e);var n,i;if(e.query&&e.query.results&&e.query.results.contact){e.data=e.query.results.contact,delete e.query,e.data instanceof Array||(e.data=[e.data]);for(var r=0;r<e.data.length;r++){n=e.data[r],n.id=null;for(var a=0;a<n.fields.length;a++)i=n.fields[a],"email"===i.type&&(n.email=i.value),"name"===i.type&&(n.first_name=i.value.givenName,n.last_name=i.value.familyName,n.name=i.value.givenName+" "+i.value.familyName),"yahooid"===i.type&&(n.id=i.value)}}return e}function o(e){e.query&&e.query.count&&(e.paging={next:"?start="+e.query.count})}var i=function(e){return"https://query.yahooapis.com/v1/yql?q="+(e+" limit @{limit|100} offset @{start|0}").replace(/\s/g,"%20")+"&format=json"};e.init({yahoo:{oauth:{version:"1.0a",auth:"https://api.login.yahoo.com/oauth/v2/request_auth",request:"https://api.login.yahoo.com/oauth/v2/get_request_token",token:"https://api.login.yahoo.com/oauth/v2/get_token"},autorefresh:!1,base:"https://social.yahooapis.com/v1/",get:{me:i("select * from social.profile(0) where guid=me"),"me/friends":i("select * from social.contacts(0) where guid=me"),"me/following":i("select * from social.contacts(0) where guid=me")},wrap:{me:function(e){return t(e),e.query&&e.query.results&&e.query.results.profile&&(e=e.query.results.profile,e.id=e.guid,e.name=e.givenName+" "+e.familyName,e.last_name=e.familyName,e.first_name=e.givenName,e.email=e.emails?e.emails.handle:null,e.thumbnail=e.image?e.image.imageUrl:null),e},"me/friends":n,"me/following":n,"default":function(e){return o(e),e}},xhr:!1}})}(hello);
\ No newline at end of file
diff --git a/package.json b/package.json
index 3502dcd5..7b89e418 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "HelloJS",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "scripts": {
     "test": "karma start",
     "build": "node _build.js"