Merge pull request #66 from rc0r/master