Merging master to dev for release 0.9.6