#5

pull request for #5