Merge pull request #39 from neoascetic/fixes/29

Ability to use column aliases. Fixes #29
Merge branch 'master' into df