Bug fixes
Version 2.0.1