Merged kidGodzilla master branch