Fixes issue #15. Now any And file is properly parsed. All tested.