Merge pull request #2 from twostars/master

Merge pull request #419 from Annunaki/master …