KNIFE-335 fixing merge issue
Merge pull request #55 from rackspace/merge_fix

KNIFE-335 fixing merge issue