changes due to new Ubuntu distro (13.10)
changes due to move to OS X