Merge pull request #1 from SEL-Columbia/master