Added more features and extensibility
Merge remote-tracking branch 'origin/master'