fix
Merge pull request #3 from macheretj/experimental

New code updates