updated
some more changes and fixes
Merge pull request #479 from ffrensch/master

 	some more changes and fixes