Merge pull request #28 from mplaza/paulbranch

Paulbranch