Closed stdweird closed 8 years ago
Fixes #131
Code is OK but there's a merge conflict
@ned21 rebased and conflict resovled
Fixes #131