Victor

Merging victor's changes into the master branch. I expect no issues to arise from this.