20140621 - lab2 (update)