[master]

- Basic framework
[master]

- Fixed some bugs