Refactored, and updated nuget package version and dependencies closes #8