added *.class to ignore
merging dev and master
Fixed old constructor.