Refactoring, switched to pyepub 0.4