first working version
ubuntu-13.10 merge fixed