Merge pull request #47 from bozana/displayOptions