Updating initial commit with edits/fixes from @kosso 

Hey! Just looking to get these changes setup in the the master version so I can get back to work here making this thing perfect :) Finally going to use it for another project and want to make sure it's all up to date before adding more enhancements in the near future! Thanks for keeping this going!