bug fix 20140603
bug fixes
Merge branch 'temp1'