Merge pull request #7 from jamesblack/master

Fixes
Fixes to navery to make her more OSI like. [AlwaysMurder]. (Fix Courtesy of SomeDude)