Corrected #118
Merged master fix