Merging in development branch for initial release