Merge pull request #118 from ysb33r/development

A better fix for #113