merge changes from pro / fixes #22