Merged branches from dan

YEAH!