diff --git a/.travis.yml b/.travis.yml
index 140bd4d..e0bbed8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,18 @@
 ---
 language: ruby
-bundler_args: --without development
-before_install: rm Gemfile.lock || true
-sudo: false
-cache: bundler
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes 
-  - PUPPET_VERSION="~> 3.8.4"
-  - PUPPET_VERSION="~> 3.8.4" FUTURE_PARSER=yes
-  - PUPPET_VERSION="~> 4.0.0"
-  - PUPPET_VERSION="~> 4.1.0"
+bundler_args: --without development
 matrix:
-  exclude:
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.2.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.3.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.4.0"
+  fast_finish: true
+  include:
   - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 4.0.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.0.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 4.1.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.1.0"
+    env: PUPPET_GEM_VERSION="~> 3.6.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+sudo: false
diff --git a/Gemfile b/Gemfile
index fec9204..3c2cf45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,22 +1,37 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'puppet', ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : "3.0"
-gem 'rake', '~> 10'
-gem 'rspec-puppet', '~> 2.0'
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 2.7'
+
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'rspec-puppet', '~> 2.3'
+gem 'rspec-puppet-facts', '>= 1.7'
 gem 'puppetlabs_spec_helper', '>= 0.8.0'
-gem 'puppet-lint', '>= 1'
-gem 'puppet-lint-unquoted_string-check'
-gem 'puppet-lint-empty_string-check'
-gem 'puppet-lint-spaceship_operator_without_tag-check'
+gem 'puppet-lint'
 gem 'puppet-lint-absolute_classname-check'
-gem 'puppet-lint-undef_in_function-check'
+gem 'puppet-lint-absolute_template_path'
+gem 'puppet-lint-appends-check'
+gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
+gem 'puppet-lint-empty_string-check'
+gem 'puppet-lint-file_ensure-check'
 gem 'puppet-lint-leading_zero-check'
+gem 'puppet-lint-numericvariable'
+gem 'puppet-lint-param-docs', '>= 1.3.0'
+gem 'puppet-lint-resource_reference_syntax'
+gem 'puppet-lint-spaceship_operator_without_tag-check'
+gem 'puppet-lint-strict_indent-check'
 gem 'puppet-lint-trailing_comma-check'
-gem 'puppet-lint-file_ensure-check'
+gem 'puppet-lint-undef_in_function-check'
+gem 'puppet-lint-unquoted_string-check'
+gem 'puppet-lint-usascii_format-check'
 gem 'puppet-lint-variable_contains_upcase'
+gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
-gem 'rspec-puppet-facts'
+gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
+gem 'json', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
+gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
 gem 'metadata-json-lint'
-gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
-gem 'json', '~> 1.0', {"platforms"=>["ruby_18", "ruby_19"]}
-gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_18", "ruby_19"]}
+gem 'webmock', '< 2.0'
+gem 'addressable', '< 2.4', {"platforms"=>["ruby_18"]}
+gem 'oauth'
+gem 'parallel_tests'
diff --git a/manifests/pushgateway.pp b/manifests/pushgateway.pp
index 3382655..785501a 100644
--- a/manifests/pushgateway.pp
+++ b/manifests/pushgateway.pp
@@ -36,6 +36,9 @@
 #  [*web_listen_address*]
 #     Address to listen on for the web interface and API. (default ":9093")
 #
+#  [*web_telemetry_path*]
+#  web_telemetry_path
+#
 #  [*extra_options*]
 #  Extra options added to alertmanager startup command
 #
diff --git a/metadata.json b/metadata.json
index 3ee3c2b..50480ef 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
 	"name": "cristifalcas-prometheus",
-	"version": "1.1.2",
+	"version": "1.2.0",
 	"author": "Cristian Falcas",
 	"summary": "Prometheus Puppet module",
 	"license": "Apache-2.0",