Issue #40
delete
Bug fixes
Latest changes
after ash's merge