Jesse

Merging my branch to master