Merge pull request #27 from radiodoc/master

Pulling in new master