8-20-13

Testing branch
Merge pull request #1 from murtys/Jacob's-Branch

8-20-13