Updated for 0.4. Autor: Andozak