ignore idea's files
Merge remote-tracking branch 'origin/master'
* fix possible memory leak
* fix some comments