some new features
Merge pull request #25 from PassioEtDesiderium/master

some new features