Added optimized bases. Fixes issue #30.