added from fork
Merge pull request #2 from csexperion/master

added from fork