fix 20140715
ready for merge