Version 1.1 Merge

Gotta keep moving!