Fixed issue #7
Merge branch 'issue7'