continued changes
Merge pull request #1 from fransef/master

continued changes