jxp+alix edits
Merge pull request #1 from profxj/jxp_updates_15dec2014

jxp+alix edits