saber-nyan Merge pull request #16 from RSKYS/patch-1