Prateek vai's refactoring merging with master #4

Closed tareq89 closed 8 years ago