synesthesiam Merge pull request #295 from montydrei/master