fixed solution
Merge pull request #550 from adamarla/master

fixed solution