working on issue #21 making the library PSR-0 compliant
Merge branch 'issue21'