Merge branch 'hotfixIssue#5'
Issue#6 Solved
Merge branch 'hotfixIssue#6' into develop