Merging your changes back into master so I can continue some sexy dev