Added public method
Conflicts resolved
Merge pull request #1 from mondayrain/master

pulling from larissa