Merge pull request #177 from Disasm/master