New branch

this will fix issue #4