fixed #23
Merge pull request #30 from starteam/feature/issue_23

Fixed #23