Fix wrong variable names  #98
Coding style  #98
Changelog  #98