fixed big #17 bug. Ready for version .9!