Tested with Ubuntu 12.04 and 13.10 server

Please merge