Implement #282
Fix #292
Fix issue in Readme