Merging some nice changes from Danthemellowman! :D!