Merge pull request #1 from vekou/temp

Master Merge