Merge https://github.com/kdeesh/smart-office
Merge origin/master