Merge pull request #409 from cyberious/MOD1661