Fixed few issue #14