Nr 2

Answer to first question
Merge pull request #1 from sigison/Master2

Nr 2