Fixed bug #97
Merge pull request #101 from alpaca-tc/fixed_97

Fixed bug #97