Merge pull request #31 from cgeoffroy/pr-update_project_to_setuppy