Merge pull request #72 from gary-pei/master

Use natural keys in initial_data