Updated usage
Merging with master
Updated usage