Merge pull request #27 from radiodoc/master

Pulling in new master
Merge pull request #33 from radiodoc/programming

Merge pull request #27 from radiodoc/master