Merge pull request #1 from templaza/master

merged with templaza/tz_portfolio