Another fixes 01
Merge pull request #1 from ivanj/anotherFixes

Another fixes 01