2014-05-15 final commit

2014-05-15 final commit