Merge pull request #11 from reidbaker/master

Tags and code runnable