hrbrmstr Merge pull request #55 from gkampolis/master