Merge master
Merge pull request #1 from alrdeveloper/allan

Merge master