Merge pull request #1314 from ahomatthew/projects/jnap

Projects/jnap
fixes JNAPC-211
Merge pull request #1315 from Tendrid/projects/jnap

fixes JNAPC-211
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap