Merge with Fix for #31
Cleaned up fix for #31
Fix typo