STABLE VERSION
- fixed some bugs