I've made some changes to installer.py that have been merged. Let me know if there are any merge conflicts with this patch.