Added feature to resolve #1