Backing up changes made during OSCON.
Merge pull request #28 from mpark/oscon

OSCON