Merge pull request #211 from tobiasd/20140622