Merge pull request #512 from paraipanakos/master