This should address issues 48 and 120
Addressing comments
Fixing arrow legacy error
Fixing conflicts
Merge pull request #125 from antgonza/issue_48

This should address issues 48 and 120