Added withKeepAlive, some refactoring
Changes from 1.2.0 upload to NuGet