Updated this branch to incorporate all current changes in the master as of : 07/09/2013