synchronization with nook branch
synchronization with nook branch
updated ChangeLog