Fix for 8-1
Fix some issue for 8
Update 8-3
Fix 8-4
Merge pull request #81 from objccn/issue-8-vienta

Issue 8 vienta