close #456
Merge pull request #464 from fommil/master

close #456