Merged Pull request #132