Bug fix
Merge pull request #41 from kelvinblade/master

Bug fix