Finished part 1
Merge pull request #4 from tiger-swallowtails-2014/gary_ryan

Finished part 1