Modified for better user experience
modified for encoding support
Merge branch 'experimental'
Bug correction and better user experience