Merge MightyPirates/master

Update from upstream