Message Passing Interface (MPI) is commonly used to write parallel programs for distributed memory parallel computers. MPI-CHECK is a tool developed by the Iowa State University's High Performance Computing Group to aid in the debugging of MPI programs that are written in free or fixed format Fortran 90 and Fortran 77. MPI-CHECK provides automatic compile-time checking and some run-time checking of MPI Programs. However, MPI-CHECK 1.0 does not detect situations where possible deadlocks may occur. This thesis presents the methods used in MPI-CHECK 2.0 to detect many situations where actual and potential deadlocks may occur when using blocking and non-blocking point-to-point routines as well when using collective routines.