merging with melabranch
Merge pull request #30 from mplaza/paulbranch

merging with melabranch