Merge pull request #101 from SocalNick/master