added features
Merge pull request #1 from E1M/master

Additional features