Merging recent changes to master #7

Closed viswajithiii closed 7 years ago