Fix .gitignore and minor changes
Merge pull request #143 from millecker/merge

Fix .gitignore and minor changes