Play Fair Cipher (Version 2-with some corrections)

In my last post, I attached a file (PlayFairCipher.java) as my Play Fair Cipher Crypto System. But, I found out that it has an error when converting single row or column-wise words (E.g. WORD, PICO).
Hence, I re-edited the file and my second version of it. Now it was working as expected.

File : PlayFairCipherv2.java
Comments are welcome.