Fixes #33 - Adds support for multiple formats
Merge branch 'master' of github.com:jrcryer/psi