Merge pull request #2 from lanceulmer/working

06/28/13 commits