May updates
Merges jsla/master
Merge pull request #54 from jxson/master

Deets for May 30th