Merge pull request #180 from eVoLuTiVeMEDIA/master

some changes
Merge pull request #181 from eVoLuTiVeMEDIA/master

Some usability improvements and code cleaning