Merge pull request #43 from jxson/master

Feb 28th updates
breakfix
Merge pull request #1 from jsla/master

courtesy pull request for breakfix