Fixes #33 - Adds support for multiple formats