minor refactoring to comply with pbc
Merge pull request #5 from wick-ed/0.5.8-beta

reviewed with 0.5.8-beta