Merge pull request #96 from ihptru/master

fixes #26; fixes #33; fixes #94;