remy Merge pull request #4 from harmenjanssen/master