Updated build options for issue #2.