Merge branch 'JNAP' of github.com:sightmachine/SimpleSeer into JNAP
Merge branch 'JNAP' of github.com:demaagdk/SimpleSeer into JNAP