Fixing greedy attribute matching
Version bump - 0.1.17