updated to dev 20140112