Improvements and resolve #2