Merge pull request #12 from ashleygwilliams/master

prettyplz