Merge pull request #14 from mplaza/master

Merge pull request #13 from mplaza/paulbranch