Refactoring; version 1.1 release.