Package

@clearskies want to make sure you're cool with the license

will fix #15 and #12