- fixed #1
- fixed a possible memory leak