Merge pull request #2 from jmnemonix/master

?