Merge batch locale check support

This PR fixes issue #5 .