Merge pull request #45 from openpprn/R1.0

R1.0
Merge branch 'master' into R1.0