20131220 commit

please pull