Bug fix
Bug fix
Bug fix
Formatting and bug fixes
version 1.1