Merged Pullrequest #3