sole Merge pull request #59 from thp/fixes0