Merge pull request #1 from mtakent/master

12/04 Pull Request
12/4 MH Commit
Merge pull request #3 from mvofdt/master

12/4 Commit