development Mon Sep  1 15:08:09 MDT 2014: Added struct to handle options