fixed #18 and docs update)