Merge pull request #2 from JRoTheGeek/master