v0.3.0 Dev

Merging latest dev work for npm version 0.3.0