maikramer Merge pull request #28 from pavethem/master