beta v0.9.2 code

imported from old SVN repo