Fixed issue #27
Merge branch 'issue_27'