[master]

- some modifications