Merge pull request #1 from jgraph/master

my pull request to get all the updates from the master branch