Merge pull request #8 from kreczko/master

Unfolding updates + experimental stuff
fixing dependencies on external modules
renamed and added measurement script parts;moved current to experimental.