merge changes from creynders, tagging 0.6.2