Pulling in from mceoin/artspace

Just created the branch