Merge pull request #3 from rockhouse/master

Update