Changes to usage
Merge dev