Merge origin/master into Shenal
Merge pull request #2 from ridwannaruto/Shenal

Shenal Did Something Finally!!!!