Merge branch 'DeamonIssues' of github.com:ups100/TIN
Merging with DeamonIssues where some find file problem was solved.
Merge branch 'master' of github.com:ups100/TIN into DeamonIssues
Changing Alias into State Machine. Almost done.