Merge pull request #88 from fysics/master