Add support to state on general and support to state and city on string formatter
merge PR#3
update version