Merge pull request #2 from thebinarypenguin/master