Fixes #19, possibly fixes #20
Merge pull request #22 from Trevoke/dev

Fixes #19, possibly fixes #20