Added installer; changes for simpler installation