jsignanini Merge pull request #5 from heyfluke/master