Merge remote-tracking branch 'example42/devel' into develop

Conflicts:
	LICENSE
	README.md
	Rakefile
	spec/spec_helper.rb