Fixes for Copy and Option changes.
Merge pull request #23 from mrmonday/copy-option-fixes

Fixes for Copy and Option changes.
Fix OS X build.
Merge pull request #24 from jshrake/master

Fix OS X build.