V1.5.3

Bug fixes and coding standards