Added Changes from "Master" branch
and adjusted gitignore and classpath