Performance improvements & code cleanup.
Updated nuget package to v0.7.0