fix #3 arrgghh... damn this thing for not working.
fix merge