Bug fix. Ready for release initial version