Merge pull request #2 from 131cm/master

?