Stage 2&3

content added
Merge pull request #19 from jokosh/master

Stage 2&3