Merged with master and added thank you fanciness.