merge changes for initial release