stilldavid Merge pull request #32 from bright-light-in-the-night/patch-1