Merge pull request #28 from rc0r/rc0r-fixes