continue working
Continue fixing.
issue #24 fixed