SHAWA: Release 1.2.5

Fixed minor bugs