Gabriel Duarte Merge pull request #6 from nathanharper/master