Merge pull request #2 from gentoo/week1_json_switch