Added support for custom version numbers
Fixed bug with address in input