update & commit before merging with #12