Merge pull request #41 from rtorr/master

Update