Finished 2
Merge pull request #3 from tasilb/2

Finished 2