Merge Pullrequest #24