Update from dev branch for release 0.1