merged release/20141217a
update README