Improved tests
Added remove_spaces option
Updated to Ver.0.22