Development

Cloned from development branch and tested on Ubuntu 12.04