Mergeing my branch "jimjam" into master.