Final Commit
Merge pull request #12 from Dafinka/master

Final Commit