Update to r16
Merge pull request #4 from wf9a5m75/master

Update to r16