Merge pull request #15 from mplaza/master

Merge pull request #14 from mplaza/paulbranch
Merge pull request #16 from mplaza/paulbranch

Merge pull request #15 from mplaza/master