Test code
Merge pull request #280 from Lerogero/master

Test code