Fix to m5nr query.
Merge pull request #567 from jaredbischof/develop

Fix to m5nr query.
Merge pull request #17 from teharrison/develop

merge from develop
Merge pull request #568 from teharrison/shock

merge from develop