some of the last changes
Merge pull request #13 from dknip/master

some of the last changes