Merge pull request #415 from texane/chipid_refactor