code refactoring
improved error handling + reporting
increased version