Added latest changes. Switched all work to github.