PRXNXT-47 PRXNXT-61
Merge pull request #43 from PRX/fix/47_61

PRXNXT-47 PRXNXT-61