merged development into beta
Cleaned up. changed version