Merge branch 'minorchanges' into protocoderL
Merge pull request #76 from victordiaz/protocoderL

Merge branch 'minorchanges' into protocoder4