mfrasca Merge pull request #25 from WLOGSolutions/master