resolved merge conflicts
Merge pull request #38 from mplaza/paulbranch

resolved merge conflicts