refactored to new specifications
Merge branch 'master' of github.com:vkostyukov/quipu