added more to comment
merged new feature