Merge pull request #47 from mplaza/paulbranch

Paulbranch
Merge pull request #48 from mplaza/paulbranch

Paulbranch