Pull down commits from tweecode/master

Getting my fork up to date with the official release.