stevedonovan Merge pull request #8 from ncopa/master