Merge MightyPirates/master

Update from source repository