Merge pull request #2 from michaeltirenin/master

Final Merge
added another statement
conflict untangled