updated
fix namings
Merge pull request #470 from ffrensch/master

 	updated