Fixed bug in prev commit
Merge pull request #171 from adamarla/master

Fixed bug in prev commit