Merge pull request #100 from johmue/pullbranch

several changes see comment