Merging develop to release v0.0.16