version 1.2

Code structure improvements.