Up to date

If you don't mind, I can periodically make a pull request in order to keep your repository up to date also.

I'll add more features in 30 days aprox since I'm really busy at university at the moment.