Initial version for Github
fixed small, breaking bug from last SVN commit