new version
small minor changes
Merge pull request #1 from kapparulz/master

new