Committing Microjunk's changes

Comitting Microjunk's changes to a new branch, to be merged into Master.
Hope nothing goes wrong. :D