- cleaned up back merge
- no vala support here