Merging dot9 branch

Resolving issue #16