Merge pull request #28 from openxc/next