Various changes

Close of issues #1 and #2
sorting gitignore