Fixed #17
Merge issue17 into master