merge
folder removed
minor bugs corrected
tmp folder deleted
idea folder deleted
tmp folder deleted