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

some new features