Merge pull request #23 from tgerdes/cpu_mode

Allow setting cpu_mode