Fixing merge conflict
Merge pull request #20 from airauth/mergefixrad

Fixing merge conflict