Merge pull request #1 from AditTech/master

pull 1