Change to support version 6.1
Merge pull request #47 from vhalbert/support61

Change to support version 6.1