Enhancements

[Madi-S]

Feel free to publish issues or your recommendations/ideas how to make this project better I will most certainly have a look at them and probably come up with something in a forseeable future