Fixed issue #11
Merge branch 'issue11'