Merge pull request #4 from embolalia/master

Pull master in