Merge pull request #244 from retro-wertz/sync_to_upstream