wip
Merge branch 'v2' of github.com:mamlukishay/kl into v2

Conflicts:
	lib/parser.rb
	spec/num_builder_spec.rb