this commit fixed #14 and closes #16 also