2013 04 29

Resolves:
YAMP-69
YAMP-70
YAMP-68
YAMP-66