Merging master back into dev, release 0.0.2