sync with latest + tweaks #17

Closed brikou closed 13 years ago