merging pull-request closes #2