Issue#6 Solved
Merge branch 'hotfixIssue#6'