Fixes #1;
Merge pull request #2 from shaq1/iss#1

Fixes #1;