update 201412
Merge pull request #32 from stonebig/release201412

update 201412