Merge pull request #99 from thorfdbg/master