kieselsteini Merge pull request #12 from nicqrocks/master …