Fixed #18

Related to #9. Merge that pull request first.