Merge changes

For the win