Added comments and some formatting changes as per Trooper format
Merged with upstream
Fixed formatting
Merge pull request #31 from jagadeesh-huliyar/master

Fixed formatting and added comments