Merge pull request #219 from eVoLuTiVeMEDIA/master

Some fixes and improvements