* Merge latest code changes into Github Master * temporary modification for travis * temporary modification for travis
