[master]

- fixed bugs