Merge pull request #28 from brentspector/master

WE CAN HAZ NICE THINGS