Refactoring and fixing issue #7.
Fixed issue #7.
Merge branch 'unstable'

Conflicts:
	leaf.cabal