Merge pull request #6 from rtsuk/master

Merging master down to fork
Adding non-unique block for fleet captain
Merge pull request #93 from tblackwe/master

Adding non-unique check for fleet captain