stevedonovan Merge pull request #4 from starius/master