Tidied up the interface
Modified documentation