RFC 003
Merge pull request #80 from hjacobs/master

RFC 003