Corrected default values. closes #18