Bug fixes from #233 manually applied to develop branch
resolved compiler warnings
updated gitignore