Development hans

resolves #17 and #32