Merge pull request #130 from andrenarchy/master