Update1

See commits.

Btw. Your code style should be better (int type initial lower, string type initial upper, and more) :)