Merge pull request #501 from paraipanakos/master