Code style improvements
Build update
v.1.3.0