Dev

Merging in @frett's changes & suggestions