Final updates

This version will be the first release