Merged with development branch ---
- close#1