Merge pull request #1 from codeandfury/master