Added more interfaces
Coding style
Merge branch 'develop'