Fix #58, small improvements
Fix git ignore