refactored names for simpler copying
added ubuntu 13.04