Merge pull request #419 from Annunaki/master …