merge changes from featureset_20141209
bump version