Changes in build scripts for NuGet + Adding Option support + refactoring