Merge pull request #1 from aks5686/develop

All Added
Merge pull request #2 from aks5686/master

Merge Final