Merge pull request #299 from ThePyrotechnic/Dev

#290, #288, #285, #297, #296, #295, #293, #289, #298.
syntactical error.