Merge pull request #1286 from brooksryba/projects/jnap

Untitled
selects
Merge pull request #1287 from Tendrid/projects/jnap

Projects/jnap