Merge pull request #9 from lluj/devel

Devel
pn_update
pn_update
pn_update for julien
Merge pull request #11 from paulnicholas/master

update