changes made in encode
Merge remote-tracking branch 'sb/master'

Conflicts:
	lib/megam/api.rb
	test/test_helper.rb