Merged changes

Awesome.