Maybe it is the time to merge this into our original project. Review by @vjovanov