V2.0 span not picture

Addresses issue #210