merge Jun's changes into Mono #23

merge Jun's changes into Mono proj files