orta Merge pull request #25 from haydenholligan/master