ericmoderbacher Merge pull request #3 from sarweiler/master