Merge the master with the changes of PR #121

Please review and merge