Code

Merge pull request #553 from Whissi/issue_553