Merge pull request #28 from mplaza/paulbranch

Paulbranch
Merge pull request #29 from mplaza/master

Merge pull request #28 from mplaza/paulbranch