Fixed issue 5
Merge branch 'development'