Merge pull request #181 from SuperVirus/master