DEV-02: small changes
DEV-00: init commit