4.0 dev

6/24/2014 
merge 4.0 dev to master branch