Version 3.0

- bug fixes