Sync with master #21

Closed laurisvan closed 10 years ago