Merge pull request #2 from keneanung/master

Fixed the use of option values as columns