Cleaner version. Better code. Readme and license included.