pulled changes from former SVN repo