Gabe

Merging my changes to master branch.