P_Sam1 commit

commit
@emmali
Merge pull request #1 from emmali/P

P_Sam1 commit