TheJaydox 1.5.1

Merge latest into master