Updated code from current master branch