Merge pull request #244 from pstaabp/stage3

Stage3