June updates
Merge branch 'master' of github.com:jsla/js.la
Merge pull request #59 from jxson/master

June updates