alfism1 Merge pull request #11 from alfism1/part-seven