Merge pull request #577 from paraipanakos/master