Merge pull request #17 from wardi/master

tidy up for pyrf-0.4.0