Some features for inclusion and spanish translation offering

[ikm]

Thanks, merged. I've added you to the members of the project, so you can just push your changes to the main repository (please try to keep stuff working and preserve existing features).

[chulai]

Thank you. Will do my best.