Version 2.2.1

- bug fixes