marking fixed issues in version 2: #340 #346 #339 #389 #351 #352 #392 #397 #424 #423 #422 #421 #417 #416 #425 #414 #405 #390 #368 #339