diff --git a/doc/alphabetical_index.html b/doc/alphabetical_index.html
index 500b98df..036a2fd8 100644
--- a/doc/alphabetical_index.html
+++ b/doc/alphabetical_index.html
@@ -266,7 +266,7 @@
       </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:25 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/class/CanvasRequestService.html b/doc/class/CanvasRequestService.html
index 873aefad..1d77aec1 100644
--- a/doc/class/CanvasRequestService.html
+++ b/doc/class/CanvasRequestService.html
@@ -87,7 +87,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/class/InvalidConfigFile.html b/doc/class/InvalidConfigFile.html
index 4960ed45..62faca42 100644
--- a/doc/class/InvalidConfigFile.html
+++ b/doc/class/InvalidConfigFile.html
@@ -83,7 +83,7 @@ Error: Invalid configuration file: /opt/resin.conf
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/class/InvalidCredentials.html b/doc/class/InvalidCredentials.html
index ee8e729d..e4ca33ae 100644
--- a/doc/class/InvalidCredentials.html
+++ b/doc/class/InvalidCredentials.html
@@ -70,7 +70,7 @@ Error: Invalid credentials
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/class/NotAny.html b/doc/class/NotAny.html
index e92ba6ef..8e8609ef 100644
--- a/doc/class/NotAny.html
+++ b/doc/class/NotAny.html
@@ -83,7 +83,7 @@ Error: You don&#39;t have any applications
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/class/NotFound.html b/doc/class/NotFound.html
index 37d93c55..5f060fff 100644
--- a/doc/class/NotFound.html
+++ b/doc/class/NotFound.html
@@ -83,7 +83,7 @@ Error: Couldn&#39;t find application
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/auth/auth.coffee.html b/doc/file/lib/resin/auth/auth.coffee.html
index 5b23623e..11d1f5e1 100644
--- a/doc/file/lib/resin/auth/auth.coffee.html
+++ b/doc/file/lib/resin/auth/auth.coffee.html
@@ -47,8 +47,9 @@
     </span>
     <span class='note private title'>Private</span>
     <span class='desc'>
-      Authenticate with the server <pre><code>resin.auth.authenticate credentials, (error, token) -&gt;    throw error if error?    console.log(token)
-</code></pre>
+      Authenticate with the server <p>resin.auth.authenticate credentials, (error, token) -&gt;
+    throw error if error?
+    console.log(token)</p>
     </span>
   </li>
   <li>
@@ -134,8 +135,9 @@
     <strong>Note:</strong>
     You should use login() when possible, as it takes care of saving the token as well. 
   </div>
-  <p>Authenticate with the server</p><pre><code>resin.auth.authenticate credentials, (error, token) -&gt;    throw error if error?    console.log(token)
-</code></pre>
+  <p>Authenticate with the server</p><p>resin.auth.authenticate credentials, (error, token) -&gt;
+    throw error if error?
+    console.log(token)</p>
 </div>
 <div class='tags'>
   <h3>Parameters:</h3>
@@ -388,7 +390,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/config/config.coffee.html b/doc/file/lib/resin/config/config.coffee.html
index de8fcdf8..402e5e1a 100644
--- a/doc/file/lib/resin/config/config.coffee.html
+++ b/doc/file/lib/resin/config/config.coffee.html
@@ -119,7 +119,7 @@ console.log(contents.remoteUrl)
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/data/data-prefix.coffee.html b/doc/file/lib/resin/data/data-prefix.coffee.html
index 1f8f4158..f339573e 100644
--- a/doc/file/lib/resin/data/data-prefix.coffee.html
+++ b/doc/file/lib/resin/data/data-prefix.coffee.html
@@ -169,7 +169,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/data/data.coffee.html b/doc/file/lib/resin/data/data.coffee.html
index b8003653..0982c032 100644
--- a/doc/file/lib/resin/data/data.coffee.html
+++ b/doc/file/lib/resin/data/data.coffee.html
@@ -37,7 +37,7 @@
       </table>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/data/fs-utils/fs-utils.coffee.html b/doc/file/lib/resin/data/fs-utils/fs-utils.coffee.html
index 10fd15ea..909078c6 100644
--- a/doc/file/lib/resin/data/fs-utils/fs-utils.coffee.html
+++ b/doc/file/lib/resin/data/fs-utils/fs-utils.coffee.html
@@ -156,7 +156,7 @@ console.log isDirectory(&#39;/Users/me/app.js&#39;) # False
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/device/device.coffee.html b/doc/file/lib/resin/device/device.coffee.html
index e55a9fd0..f967283a 100644
--- a/doc/file/lib/resin/device/device.coffee.html
+++ b/doc/file/lib/resin/device/device.coffee.html
@@ -186,7 +186,7 @@ console.log(devices)
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/errors/errors.coffee.html b/doc/file/lib/resin/errors/errors.coffee.html
index 02c0e427..0d1ea10d 100644
--- a/doc/file/lib/resin/errors/errors.coffee.html
+++ b/doc/file/lib/resin/errors/errors.coffee.html
@@ -94,7 +94,7 @@ resin.errors.handle(error, shouldExit)
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/helpers/helpers.coffee.html b/doc/file/lib/resin/helpers/helpers.coffee.html
index 1082dfa9..28d33b38 100644
--- a/doc/file/lib/resin/helpers/helpers.coffee.html
+++ b/doc/file/lib/resin/helpers/helpers.coffee.html
@@ -159,7 +159,7 @@ console.log(object.dataPrefix) # /opt/resin
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/index.coffee.html b/doc/file/lib/resin/index.coffee.html
index e0120e69..f6ccfc1c 100644
--- a/doc/file/lib/resin/index.coffee.html
+++ b/doc/file/lib/resin/index.coffee.html
@@ -57,7 +57,7 @@
 </dl>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/log/log.coffee.html b/doc/file/lib/resin/log/log.coffee.html
index 201e599c..9012bb8d 100644
--- a/doc/file/lib/resin/log/log.coffee.html
+++ b/doc/file/lib/resin/log/log.coffee.html
@@ -348,7 +348,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/models/_canvas.coffee.html b/doc/file/lib/resin/models/_canvas.coffee.html
index 3615e5a1..b335a94e 100644
--- a/doc/file/lib/resin/models/_canvas.coffee.html
+++ b/doc/file/lib/resin/models/_canvas.coffee.html
@@ -47,7 +47,7 @@
       </table>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/models/application.coffee.html b/doc/file/lib/resin/models/application.coffee.html
index fe6ee418..5880a872 100644
--- a/doc/file/lib/resin/models/application.coffee.html
+++ b/doc/file/lib/resin/models/application.coffee.html
@@ -326,7 +326,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/models/device.coffee.html b/doc/file/lib/resin/models/device.coffee.html
index 36a8e5b5..a2e06182 100644
--- a/doc/file/lib/resin/models/device.coffee.html
+++ b/doc/file/lib/resin/models/device.coffee.html
@@ -316,7 +316,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/models/environment-variables.coffee.html b/doc/file/lib/resin/models/environment-variables.coffee.html
index 1f1ff3bd..82cdd3f5 100644
--- a/doc/file/lib/resin/models/environment-variables.coffee.html
+++ b/doc/file/lib/resin/models/environment-variables.coffee.html
@@ -158,7 +158,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/models/index.coffee.html b/doc/file/lib/resin/models/index.coffee.html
index 15b5286b..c5d4895b 100644
--- a/doc/file/lib/resin/models/index.coffee.html
+++ b/doc/file/lib/resin/models/index.coffee.html
@@ -52,7 +52,7 @@
 </dl>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/os/os.coffee.html b/doc/file/lib/resin/os/os.coffee.html
index ff382063..5209bcaf 100644
--- a/doc/file/lib/resin/os/os.coffee.html
+++ b/doc/file/lib/resin/os/os.coffee.html
@@ -156,7 +156,7 @@ console.log(result)
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/server/server.coffee.html b/doc/file/lib/resin/server/server.coffee.html
index f8060de7..7caea544 100644
--- a/doc/file/lib/resin/server/server.coffee.html
+++ b/doc/file/lib/resin/server/server.coffee.html
@@ -227,7 +227,7 @@ resin.server.request {    method: &#39;GET&#39;    url: &#39;/download&#39;    p
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/settings.coffee.html b/doc/file/lib/resin/settings.coffee.html
index 68a2e157..e02070b6 100644
--- a/doc/file/lib/resin/settings.coffee.html
+++ b/doc/file/lib/resin/settings.coffee.html
@@ -77,7 +77,7 @@
 </dl>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/doc/file/lib/resin/token/token.coffee.html b/doc/file/lib/resin/token/token.coffee.html
index c290da3d..28f04795 100644
--- a/doc/file/lib/resin/token/token.coffee.html
+++ b/doc/file/lib/resin/token/token.coffee.html
@@ -235,7 +235,7 @@
 </div>
     </div>
     <div id='footer'>
-  December 08, 14 09:19:26 by
+  December 08, 14 10:08:42 by
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>
diff --git a/lib/actions/environment-variables.coffee b/lib/actions/environment-variables.coffee
index f9c559c2..1bb9005d 100644
--- a/lib/actions/environment-variables.coffee
+++ b/lib/actions/environment-variables.coffee
@@ -14,7 +14,7 @@ exports.list = ->
 	if not applicationId?
 		resin.errors.handle(new Error('You have to specify an application'))
 
-	resin.models.environmentVariables.getAll applicationId, (error, environmentVariables) ->
+	resin.models.environmentVariables.getAllByApplication applicationId, (error, environmentVariables) ->
 		resin.errors.handle(error) if error?
 
 		if not cli.getArgument('verbose')?
diff --git a/lib/resin/models/environment-variables.coffee b/lib/resin/models/environment-variables.coffee
index 1ced30f3..54cb1251 100644
--- a/lib/resin/models/environment-variables.coffee
+++ b/lib/resin/models/environment-variables.coffee
@@ -8,14 +8,12 @@ errors = require('../errors/errors')
 #
 # @throw {NotFound} Will throw if no environment variable was found
 #
-# @todo Rename this to getAllByApplication
-#
 # @example Get all environment variables by application
 #		resin.models.environmentVariables.getAll (error, environmentVariables) ->
 #			throw error if error?
 #			console.log(environmentVariables)
 #
-exports.getAll = (applicationId, callback) ->
+exports.getAllByApplication = (applicationId, callback) ->
 	return canvas.get
 		resource: 'environment_variable'
 		options: