Fork of https://sparrowtoolkit.codeplex.com to fix a bug