More functionality
Merge branch 'master' of https://github.com/Rubykuby/Test

Conflicts:
	test/code.py