Merge pull request #11 from kdop/master

bug fixes
Merge pull request #13 from kdop/master

conflict resolved
Merge pull request #15 from kdop/master

two branches merged again
removed bin
Added gitignore file to exclude /bin folder