Changes for Feb 28th
Merge jsla/master
Merge pull request #43 from jxson/master

Feb 28th updates