Merge pull request #3 from jay2013/trialBranch

Trial branch
Merge branch 'master' into trialBranch