diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 427a067..b72ff7b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,11 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-04-04 02:29:34 +0300 using RuboCop version 0.29.1.
+# on 2015-05-14 16:51:06 +0300 using RuboCop version 0.31.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 21
+# Offense count: 15
 Metrics/AbcSize:
   Enabled: false
 
@@ -13,16 +13,16 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 457
+  Max: 337
 
-# Offense count: 6
+# Offense count: 5
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 28
+# Offense count: 22
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Enabled: false
@@ -31,7 +31,7 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 18
 
-# Offense count: 3
+# Offense count: 4
 Style/AccessorMethodName:
   Enabled: false
 
@@ -41,31 +41,23 @@ Style/AccessorMethodName:
 Style/AndOr:
   Enabled: false
 
-# Offense count: 27
+# Offense count: 19
 # Cop supports --auto-correct.
-Style/Blocks:
-  Enabled: false
-
-# Offense count: 7
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
-Style/CaseIndentation:
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
   Enabled: false
 
 # Offense count: 4
 Style/Documentation:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Enabled: false
-
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 17
+# Offense count: 15
+# Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Enabled: false
@@ -75,7 +67,8 @@ Style/IfUnlessModifier:
 Style/Next:
   Enabled: false
 
-# Offense count: 5
-# Configuration parameters: MaxSlashes.
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 Style/RegexpLiteral:
   Enabled: false