BUG: Bug fixes, added tests, cleanups on documentation
BUG: Bug fixes, added tests, cleanups on documentation