Merge pull request #2 from rimmertzelle/master

Update