Applying fix for #13 on master from @fwbrasil