lucdoebereiner Merge pull request #2 from jellea/master