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

This will fix #14 fix #13 fix #11