Dev

Merge in v .5