Merge pull request #97 from thorfdbg/master