updates for primary/non-primary use case
Merge pull request #33 from shalako/master

updates for primary/non-primary use case