Minor refactoring
Repo change
Repo change
Merge pull request #6 from cnaude/master

merge