from testing branch
Merge branch 'testing'

* testing:
  from testing branch

Conflicts:
	test.rb