Fixed #10, but not in a clean way (duplicate code).
Merge pull request #20 from vietjtnguyen/dev10-direct

Fixed #10, but not in a clean way (duplicate code)