Fixes #9
Merge branch 'console-ui'

Conflicts:
	src/model/interpolator.rb