Merge geoffreyhale/hawkins